OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Teach compiletest to use multiple --src-base's" 

This reverts commit 8a07f57081.
This commit is contained in:
Corey Richardson 2013-08-30 16:17:32 -04:00
parent fdcc415957
commit f585767fba
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiletest/common.rs
View File

@ -36,7 +36,7 @@ pub struct config {
llvm_bin_path: Option<Path>,
// The directory containing the tests to run
src_base: ~[Path],
src_base: Path,
// The directory where programs should be built
build_base: Path,

34
src/compiletest/compiletest.rs
View File

@ -19,7 +19,7 @@ use std::os;
use std::f64;
use extra::getopts;
use extra::getopts::groups::{optopt, optflag, reqopt, optmulti};
use extra::getopts::groups::{optopt, optflag, reqopt};
use extra::test;
use common::config;
@ -49,19 +49,19 @@ pub fn main() {
pub fn parse_config(args: ~[~str]) -> config {
let groups : ~[getopts::groups::OptGroup] =
~[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 ("", "llvm-bin-path", "path to directory holding llvm binaries", "DIR"),
optmulti ("", "src-base", "directory to scan for test files", "PATH"),
reqopt ("", "build-base", "directory to deposit test outputs", "PATH"),
reqopt ("", "aux-base", "directory to find auxiliary test files", "PATH"),
reqopt ("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
reqopt ("", "mode", "which sort of compile tests to run",
" (compile-fail|run-fail|run-pass|pretty|debug-info)"),
optflag ("", "ignored", "run tests marked as ignored / xfailed"),
optopt ("", "runtool", "supervisor program to run tests under \
~[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("", "llvm-bin-path", "path to directory holding llvm binaries", "DIR"),
reqopt("", "src-base", "directory to scan for test files", "PATH"),
reqopt("", "build-base", "directory to deposit test outputs", "PATH"),
reqopt("", "aux-base", "directory to find auxiliary test files", "PATH"),
reqopt("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
reqopt("", "mode", "which sort of compile tests to run",
"(compile-fail|run-fail|run-pass|pretty|debug-info)"),
optflag("", "ignored", "run tests marked as ignored / xfailed"),
optopt("", "runtool", "supervisor program to run tests under \
(eg. emulator, valgrind)", "PROGRAM"),
optopt("", "rustcflags", "flags to pass to rustc", "FLAGS"),
optflag("", "verbose", "run tests verbosely, showing all output"),
@ -105,8 +105,6 @@ pub fn parse_config(args: ~[~str]) -> config {
fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
Path(getopts::opt_str(m, nm))
}
let src_base = getopts::opt_strs(matches, "src-base");
config {
compile_lib_path: getopts::opt_str(matches, "compile-lib-path"),
@ -114,7 +112,7 @@ pub fn parse_config(args: ~[~str]) -> config {
rustc_path: opt_path(matches, "rustc-path"),
clang_path: getopts::opt_maybe_str(matches, "clang-path").map_move(|s| Path(s)),
llvm_bin_path: getopts::opt_maybe_str(matches, "llvm-bin-path").map_move(|s| Path(s)),
src_base: src_base.iter().map(|x| Path(x.clone())).collect(),
src_base: opt_path(matches, "src-base"),
build_base: opt_path(matches, "build-base"),
aux_base: opt_path(matches, "aux-base"),
stage_id: getopts::opt_str(matches, "stage-id"),
@ -250,7 +248,7 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
debug!("making tests from %s",
config.src_base.to_str());
let mut tests = ~[];
let dirs = config.src_base.iter().flat_map(|x| os::list_dir_path(x).move_iter()).to_owned_vec();
let dirs = os::list_dir_path(&config.src_base);
for file in dirs.iter() {
let file = file.clone();
debug!("inspecting file %s", file.to_str());