diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-05-05 00:52:21 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-05-05 00:52:21 -0400 |
| commit | 150de252de48c80d294864a9492b517a7eb90eb3 (patch) | |
| tree | 2af5f04f36e0095369e5c38294d2ac20b7b9bfba | |
| parent | 67c9883d9aceb3a3f6395938629c38fc176e62ab (diff) | |
| parent | cde01affcd3ae1e10e7d8f2805aeeb5cd1e9eae7 (diff) | |
| download | servo-150de252de48c80d294864a9492b517a7eb90eb3.tar.gz servo-150de252de48c80d294864a9492b517a7eb90eb3.zip | |
auto merge of #2316 : Ms2ger/servo/owned-str-tests, r=jdm
| -rw-r--r-- | src/test/harness/contenttest/contenttest.rs | 4 | ||||
| -rw-r--r-- | src/test/harness/reftest/reftest.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/harness/contenttest/contenttest.rs b/src/test/harness/contenttest/contenttest.rs index ce6cecba5d8..2accc6140ad 100644 --- a/src/test/harness/contenttest/contenttest.rs +++ b/src/test/harness/contenttest/contenttest.rs @@ -92,13 +92,13 @@ fn make_test(file: ~str) -> TestDescAndFn { fn run_test(file: ~str) { let path = os::make_absolute(&Path::new(file)); // FIXME (#1094): not the right way to transform a path - let infile = ~"file://" + path.display().to_str(); + let infile = "file://".to_owned() + path.display().to_str(); let stdout = CreatePipe(false, true); let stderr = InheritFd(2); let config = ProcessConfig { program: "./servo", - args: &[~"-z", ~"-f", infile.clone()], + args: &["-z".to_owned(), "-f".to_owned(), infile.clone()], stdin: Ignored, stdout: stdout, stderr: stderr, diff --git a/src/test/harness/reftest/reftest.rs b/src/test/harness/reftest/reftest.rs index 7b65f731ec2..a6b0ed62298 100644 --- a/src/test/harness/reftest/reftest.rs +++ b/src/test/harness/reftest/reftest.rs @@ -133,7 +133,7 @@ fn make_test(reftest: Reftest) -> TestDescAndFn { fn capture(reftest: &Reftest, side: uint) -> png::Image { let filename = format!("/tmp/servo-reftest-{:06u}-{:u}.png", reftest.id, side); let mut args = reftest.servo_args.clone(); - args.push_all_move(~[~"-f", ~"-o", filename.clone(), reftest.files[side].clone()]); + args.push_all_move(~["-f".to_owned(), "-o".to_owned(), filename.clone(), reftest.files[side].clone()]); let retval = match Process::status("./servo", args) { Ok(status) => status, |