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

Remove the no-valgrind test directive now that unwinding is more worky

Browse Source 
Issue #236
This commit is contained in:
Brian Anderson 2011-09-07 17:16:04 -07:00
parent a7c9f817bb
commit e8a16353ea
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/compiletest/header.rs
View File

@ -16,10 +16,7 @@ type test_props = {
compile_flags: option::t<str>, compile_flags: option::t<str>,
// If present, the name of a file that this test should match when // If present, the name of a file that this test should match when
// pretty-printed // pretty-printed
pp_exact: option::t<str>, pp_exact: option::t<str>
// FIXME: no-valgrind is a temporary directive until all of run-fail
// is valgrind-clean
no_valgrind: bool
}; };
// Load any test directives embedded in the file // Load any test directives embedded in the file
@ -27,7 +24,6 @@ fn load_props(testfile: &str) -> test_props {
let error_patterns = []; let error_patterns = [];
let compile_flags = option::none; let compile_flags = option::none;
let pp_exact = option::none; let pp_exact = option::none;
let no_valgrind = false;
for each ln: str in iter_header(testfile) { for each ln: str in iter_header(testfile) {
alt parse_error_pattern(ln) { alt parse_error_pattern(ln) {
option::some(ep) { error_patterns += [ep]; } option::some(ep) { error_patterns += [ep]; }
@ -41,16 +37,11 @@ fn load_props(testfile: &str) -> test_props {
if option::is_none(pp_exact) { if option::is_none(pp_exact) {
pp_exact = parse_pp_exact(ln, testfile); pp_exact = parse_pp_exact(ln, testfile);
} }
if no_valgrind == false {
no_valgrind = parse_name_directive(ln, "no-valgrind");
}
} }
ret { ret {
error_patterns: error_patterns, error_patterns: error_patterns,
compile_flags: compile_flags, compile_flags: compile_flags,
pp_exact: pp_exact, pp_exact: pp_exact
no_valgrind: no_valgrind
}; };
} }

7
src/test/compiletest/runtest.rs
View File

@ -249,10 +249,9 @@ fn make_exe_name(config: &config, testfile: &str) -> str {
output_base_name(config, testfile) + os::exec_suffix() output_base_name(config, testfile) + os::exec_suffix()
} }
fn make_run_args(config: &config, props: &test_props, testfile: &str) -> fn make_run_args(config: &config, _props: &test_props, testfile: &str) ->
procargs { procargs {
let toolargs = let toolargs = {
if !props.no_valgrind {
// If we've got another tool to run under (valgrind), // If we've got another tool to run under (valgrind),
// then split apart its command // then split apart its command
let runtool = let runtool =
@ -261,7 +260,7 @@ fn make_run_args(config: &config, props: &test_props, testfile: &str) ->
option::none. { option::none } option::none. { option::none }
}; };
split_maybe_args(runtool) split_maybe_args(runtool)
} else { [] }; };
let args = toolargs + [make_exe_name(config, testfile)]; let args = toolargs + [make_exe_name(config, testfile)];
ret {prog: args[0], args: vec::slice(args, 1u, vec::len(args))}; ret {prog: args[0], args: vec::slice(args, 1u, vec::len(args))};

1
src/test/run-fail/linked-failure.rs
View File

@ -2,7 +2,6 @@
// error-pattern:1 == 2 // error-pattern:1 == 2
// xfail-test // xfail-test
// no-valgrind
use std; use std;
import std::task; import std::task;
import std::comm::port; import std::comm::port;