From: Nipunn Koorapati Date: Sun, 13 Nov 2016 05:49:44 +0000 (-0800) Subject: Fix dll prefix/suffix test for windows X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f47f45946c5a77426e330a9ab5e6403d4dc4af4b;p=cargo.git Fix dll prefix/suffix test for windows --- diff --git a/tests/build.rs b/tests/build.rs index 344b960eb..3f742a5cf 100644 --- a/tests/build.rs +++ b/tests/build.rs @@ -806,11 +806,13 @@ fn cargo_default_env_metadata_env_var() { --out-dir [..] \ --emit=dep-info,link \ -L dependency={dir}[/]target[/]debug[/]deps \ - --extern bar={dir}[/]target[/]debug[/]deps[/]libbar.dylib` + --extern bar={dir}[/]target[/]debug[/]deps[/]{prefix}bar{suffix}` [FINISHED] debug [unoptimized + debuginfo] target(s) in [..] ", dir = p.root().display(), url = p.url(), +prefix = env::consts::DLL_PREFIX, +suffix = env::consts::DLL_SUFFIX, ))); assert_that(p.cargo_process("clean"), execs().with_status(0)); @@ -832,11 +834,13 @@ url = p.url(), --out-dir [..] \ --emit=dep-info,link \ -L dependency={dir}[/]target[/]debug[/]deps \ - --extern bar={dir}[/]target[/]debug[/]deps[/]libbar-[..].dylib` + --extern bar={dir}[/]target[/]debug[/]deps[/]{prefix}bar-[..]{suffix}` [FINISHED] debug [unoptimized + debuginfo] target(s) in [..] ", dir = p.root().display(), url = p.url(), +prefix = env::consts::DLL_PREFIX, +suffix = env::consts::DLL_SUFFIX, ))); }