diff options
author | bors-servo <metajack+bors@gmail.com> | 2014-11-21 05:06:31 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2014-11-21 05:06:31 -0700 |
commit | dfa9e1aa4ac2c10b338d17fbad78f93323f66242 (patch) | |
tree | d7a4517dfbfba50512991f4ca23946bd60e3e25d | |
parent | c23bfdf1c52cdd42c37cd931525c23e22f1d289f (diff) | |
parent | 3149eae7f6b849cf3c52b699ae5505cbc8a964b3 (diff) | |
download | servo-dfa9e1aa4ac2c10b338d17fbad78f93323f66242.tar.gz servo-dfa9e1aa4ac2c10b338d17fbad78f93323f66242.zip |
auto merge of #4053 : mttr/servo/reftests_with_relative_dir, r=SimonSapin
Fixes #3521
-rw-r--r-- | tests/reftest.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/reftest.rs b/tests/reftest.rs index c7bd88fcbbb..0c747be8b5b 100644 --- a/tests/reftest.rs +++ b/tests/reftest.rs @@ -165,7 +165,14 @@ fn parse_lists(file: &Path, servo_args: &[String], render_mode: RenderMode, id_o "!=" => Different, part => panic!("reftest line: '{:s}' has invalid kind '{:s}'", line, part) }; - let base = file.dir_path(); + + // If we're running this directly, file.dir_path() might be relative. + // (see issue #3521) + let base = match file.dir_path().is_relative() { + true => os::getcwd().join(file.dir_path()), + false => file.dir_path() + }; + let file_left = base.join(test_line.file_left); let file_right = base.join(test_line.file_right); |