bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Test fixes from rollup

Browse source
This commit is contained in:
Alex Crichton 2014-02-24 21:53:46 -08:00
parent 35f2da4063
commit 7d85546721
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/run-make/unicode-input/multiple_files.rs
View file

@ -8,9 +8,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
use std::{char, os, run, str}; use std::{char, os, str};
use std::rand::{task_rng, Rng}; use std::rand::{task_rng, Rng};
use std::io::File; use std::io::{File, Process};
// creates unicode_input_multiple_files_{main,chars}.rs, where the // creates unicode_input_multiple_files_{main,chars}.rs, where the
// former imports the latter. `_chars` just contains an indentifier // former imports the latter. `_chars` just contains an indentifier
@ -55,7 +55,7 @@ fn main() {
// rustc is passed to us with --out-dir and -L etc., so we // rustc is passed to us with --out-dir and -L etc., so we
// can't exec it directly // can't exec it directly
let result = run::process_output("sh", [~"-c", rustc + " " + main_file_str]).unwrap(); let result = Process::output("sh", [~"-c", rustc + " " + main_file_str]).unwrap();
let err = str::from_utf8_lossy(result.error); let err = str::from_utf8_lossy(result.error);
// positive test so that this test will be updated when the // positive test so that this test will be updated when the

6
src/test/run-make/unicode-input/span_length.rs
View file

@ -8,9 +8,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
use std::{char, os, run, str}; use std::{char, os, str};
use std::rand::{task_rng, Rng}; use std::rand::{task_rng, Rng};
use std::io::File; use std::io::{File, Process};
// creates a file with `fn main() { <random ident> }` and checks the // creates a file with `fn main() { <random ident> }` and checks the
// compiler emits a span of the appropriate length (for the // compiler emits a span of the appropriate length (for the
@ -51,7 +51,7 @@ fn main() {
// rustc is passed to us with --out-dir and -L etc., so we // rustc is passed to us with --out-dir and -L etc., so we
// can't exec it directly // can't exec it directly
let result = run::process_output("sh", [~"-c", rustc + " " + main_file_str]).unwrap(); let result = Process::output("sh", [~"-c", rustc + " " + main_file_str]).unwrap();
let err = str::from_utf8_lossy(result.error); let err = str::from_utf8_lossy(result.error);