// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#[crate_type = "bin"];
+#![crate_type = "bin"]
+#![feature(phase)]
-#[allow(non_camel_case_types)];
-#[deny(warnings)];
+// we use our own (green) start below; do not link in libnative; issue #13247.
+#![no_start]
+
+#![allow(non_camel_case_types)]
+#![deny(warnings)]
extern crate test;
extern crate getopts;
+#[phase(link, syntax)]
+extern crate log;
+extern crate green;
+extern crate rustuv;
use std::os;
use std::io;
pub mod common;
pub mod errors;
+#[start]
+fn start(argc: int, argv: **u8) -> int {
+ green::start(argc, argv, rustuv::event_loop, main)
+}
+
pub fn main() {
let args = os::args();
- let config = parse_config(args);
+ let config = parse_config(args.move_iter().collect());
log_config(&config);
run_tests(&config);
}
-pub fn parse_config(args: ~[~str]) -> config {
+pub fn parse_config(args: Vec<~str> ) -> config {
- let groups : ~[getopts::OptGroup] =
- ~[reqopt("", "compile-lib-path", "path to host shared libraries", "PATH"),
+ let groups : Vec<getopts::OptGroup> =
+ vec!(reqopt("", "compile-lib-path", "path to host shared libraries", "PATH"),
reqopt("", "run-lib-path", "path to target shared libraries", "PATH"),
reqopt("", "rustc-path", "path to rustc to use for compiling", "PATH"),
optopt("", "clang-path", "path to executable for codegen tests", "PATH"),
optopt("", "adb-path", "path to the android debugger", "PATH"),
optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"),
optopt("", "test-shard", "run shard A, of B shards, worth of the testsuite", "A.B"),
- optflag("h", "help", "show this message"),
- ];
+ optflag("h", "help", "show this message"));
assert!(!args.is_empty());
- let argv0 = args[0].clone();
+ let argv0 = (*args.get(0)).clone();
let args_ = args.tail();
- if args[1] == ~"-h" || args[1] == ~"--help" {
+ if *args.get(1) == "-h".to_owned() || *args.get(1) == "--help".to_owned() {
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
- println!("{}", getopts::usage(message, groups));
+ println!("{}", getopts::usage(message, groups.as_slice()));
println!("");
fail!()
}
let matches =
- &match getopts::getopts(args_, groups) {
+ &match getopts::getopts(args_, groups.as_slice()) {
Ok(m) => m,
Err(f) => fail!("{}", f.to_err_msg())
};
if matches.opt_present("h") || matches.opt_present("help") {
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
- println!("{}", getopts::usage(message, groups));
+ println!("{}", getopts::usage(message, groups.as_slice()));
println!("");
fail!()
}
run_ignored: matches.opt_present("ignored"),
filter:
if !matches.free.is_empty() {
- Some(matches.free[0].clone())
+ Some((*matches.free.get(0)).clone())
} else {
None
},
logv(c, format!("adb_test_dir: {}", config.adb_test_dir));
logv(c, format!("adb_device_status: {}", config.adb_device_status));
match config.test_shard {
- None => logv(c, ~"test_shard: (all)"),
+ None => logv(c, "test_shard: (all)".to_owned()),
Some((a,b)) => logv(c, format!("test_shard: {}.{}", a, b))
}
logv(c, format!("verbose: {}", config.verbose));
}
pub fn opt_str2(maybestr: Option<~str>) -> ~str {
- match maybestr { None => ~"(none)", Some(s) => { s } }
+ match maybestr { None => "(none)".to_owned(), Some(s) => { s } }
}
pub fn str_mode(s: ~str) -> mode {
pub fn mode_str(mode: mode) -> ~str {
match mode {
- mode_compile_fail => ~"compile-fail",
- mode_run_fail => ~"run-fail",
- mode_run_pass => ~"run-pass",
- mode_pretty => ~"pretty",
- mode_debug_info => ~"debug-info",
- mode_codegen => ~"codegen",
+ mode_compile_fail => "compile-fail".to_owned(),
+ mode_run_fail => "run-fail".to_owned(),
+ mode_run_pass => "run-pass".to_owned(),
+ mode_pretty => "pretty".to_owned(),
+ mode_debug_info => "debug-info".to_owned(),
+ mode_codegen => "codegen".to_owned(),
}
}
pub fn run_tests(config: &config) {
- if config.target == ~"arm-linux-androideabi" {
+ if config.target == "arm-linux-androideabi".to_owned() {
match config.mode{
mode_debug_info => {
println!("arm-linux-androideabi debug-info \
// parallel (especially when we have lots and lots of child processes).
// For context, see #8904
io::test::raise_fd_limit();
- let res = test::run_tests_console(&opts, tests);
+ let res = test::run_tests_console(&opts, tests.move_iter().collect());
match res {
Ok(true) => {}
Ok(false) => fail!("Some tests failed"),
}
}
-pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
+pub fn make_tests(config: &config) -> Vec<test::TestDescAndFn> {
debug!("making tests from {}",
config.src_base.display());
- let mut tests = ~[];
+ let mut tests = Vec::new();
let dirs = fs::readdir(&config.src_base).unwrap();
for file in dirs.iter() {
let file = file.clone();
// Pretty-printer does not work with .rc files yet
let valid_extensions =
match config.mode {
- mode_pretty => ~[~".rs"],
- _ => ~[~".rc", ~".rs"]
+ mode_pretty => vec!(".rs".to_owned()),
+ _ => vec!(".rc".to_owned(), ".rs".to_owned())
};
- let invalid_prefixes = ~[~".", ~"#", ~"~"];
+ let invalid_prefixes = vec!(".".to_owned(), "#".to_owned(), "~".to_owned());
let name = testfile.filename_str().unwrap();
let mut valid = false;
projects / rust.git / blobdiff