diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-06-01 18:24:55 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-06-01 18:24:55 -0700 |
| commit | 7335b2a51c0b7f7ada6227134bd2b86c08b66813 (patch) | |
| tree | f375d4c04a6df11a9dea78db207377e2e7531926 /src/compiletest | |
| parent | 8f7364b26d22f945f1e013041730caaedc640a80 (diff) | |
| download | rust-7335b2a51c0b7f7ada6227134bd2b86c08b66813.tar.gz rust-7335b2a51c0b7f7ada6227134bd2b86c08b66813.zip | |
compiletest: Add the libaux path to PATH on win32
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/procsrv.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs index 0afbd95d644..ab96b5eced7 100644 --- a/src/compiletest/procsrv.rs +++ b/src/compiletest/procsrv.rs @@ -9,9 +9,13 @@ fn target_env(lib_path: str, prog: str) -> [(str,str)] { let mut env = os::env(); + // Make sure we include the aux directory in the path + assert prog.ends_with(".exe"); + let aux_path = prog.slice(0u, prog.len() - 4u) + ".libaux"; + env = vec::map(env) {|pair| let (k,v) = pair; - if k == "PATH" { ("PATH", v + ";" + lib_path) } + if k == "PATH" { ("PATH", v + ";" + lib_path + ";" + aux_path) } else { (k,v) } }; if str::ends_with(prog, "rustc.exe") { |
