OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Teach compiletest to construct the PATH variable correctly on win32

Browse Source
This commit is contained in:
Brian Anderson 2011-09-29 18:30:00 -07:00
parent b61e17bdfd
commit 196cc6de2e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/compiletest/util.rs
View File

@ -10,7 +10,9 @@ fn make_new_path(path: str) -> str {
// Windows just uses PATH as the library search path, so we have to
// maintain the current value while adding our own
alt getenv(lib_path_env_var()) {
option::some(curr) { #fmt["%s:%s", path, curr] }
option::some(curr) {
#fmt["%s%s%s", path, path_div(), curr]
}
option::none. { path }
}
}
@ -24,6 +26,13 @@ fn lib_path_env_var() -> str { "DYLD_LIBRARY_PATH" }
#[cfg(target_os = "win32")]
fn lib_path_env_var() -> str { "PATH" }
#[cfg(target_os = "linux")]
#[cfg(target_os = "macos")]
fn path_div() -> str { ":" }
#[cfg(target_os = "win32")]
fn path_div() -> str { ";" }
fn logv(config: config, s: str) {
log s;
if config.verbose { io::stdout().write_line(s); }