Make library paths passed by compiletest tool absolute.

[rust.git] / src / compiletest / compiletest.rs

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 96b52eaa0ad0fb67bf95d7506c09c49fc026c877..51bc9d71f883c19ce9b1f4f67d685fb611db6b5b 100644 (file)
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -118,9 +118,23 @@ fn opt_path(m: &getopts::Matches, nm: &str) -> PathBuf {
         }
     }
 
+    fn make_absolute(path: PathBuf) -> PathBuf {
+        if path.is_relative() {
+            env::current_dir().unwrap().join(path)
+        } else {
+            path
+        }
+    }
+
+    let filter = if !matches.free.is_empty() {
+        Some(matches.free[0].clone())
+    } else {
+        None
+    };
+
     Config {
-        compile_lib_path: matches.opt_str("compile-lib-path").unwrap(),
-        run_lib_path: matches.opt_str("run-lib-path").unwrap(),
+        compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
+        run_lib_path: make_absolute(opt_path(matches, "run-lib-path")),
         rustc_path: opt_path(matches, "rustc-path"),
         rustdoc_path: opt_path(matches, "rustdoc-path"),
         python: matches.opt_str("python").unwrap(),