Skip to content

Commit e8a1635

Browse files
committed
Remove the no-valgrind test directive now that unwinding is more worky
Issue #236
1 parent a7c9f81 commit e8a1635

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

src/test/compiletest/header.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,14 @@ type test_props = {
1616
compile_flags: option::t<str>,
1717
// If present, the name of a file that this test should match when
1818
// pretty-printed
19-
pp_exact: option::t<str>,
20-
// FIXME: no-valgrind is a temporary directive until all of run-fail
21-
// is valgrind-clean
22-
no_valgrind: bool
19+
pp_exact: option::t<str>
2320
};
2421

2522
// Load any test directives embedded in the file
2623
fn load_props(testfile: &str) -> test_props {
2724
let error_patterns = [];
2825
let compile_flags = option::none;
2926
let pp_exact = option::none;
30-
let no_valgrind = false;
3127
for each ln: str in iter_header(testfile) {
3228
alt parse_error_pattern(ln) {
3329
option::some(ep) { error_patterns += [ep]; }
@@ -41,16 +37,11 @@ fn load_props(testfile: &str) -> test_props {
4137
if option::is_none(pp_exact) {
4238
pp_exact = parse_pp_exact(ln, testfile);
4339
}
44-
45-
if no_valgrind == false {
46-
no_valgrind = parse_name_directive(ln, "no-valgrind");
47-
}
4840
}
4941
ret {
5042
error_patterns: error_patterns,
5143
compile_flags: compile_flags,
52-
pp_exact: pp_exact,
53-
no_valgrind: no_valgrind
44+
pp_exact: pp_exact
5445
};
5546
}
5647

src/test/compiletest/runtest.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,9 @@ fn make_exe_name(config: &config, testfile: &str) -> str {
249249
output_base_name(config, testfile) + os::exec_suffix()
250250
}
251251

252-
fn make_run_args(config: &config, props: &test_props, testfile: &str) ->
252+
fn make_run_args(config: &config, _props: &test_props, testfile: &str) ->
253253
procargs {
254-
let toolargs =
255-
if !props.no_valgrind {
254+
let toolargs = {
256255
// If we've got another tool to run under (valgrind),
257256
// then split apart its command
258257
let runtool =
@@ -261,7 +260,7 @@ fn make_run_args(config: &config, props: &test_props, testfile: &str) ->
261260
option::none. { option::none }
262261
};
263262
split_maybe_args(runtool)
264-
} else { [] };
263+
};
265264

266265
let args = toolargs + [make_exe_name(config, testfile)];
267266
ret {prog: args[0], args: vec::slice(args, 1u, vec::len(args))};

src/test/run-fail/linked-failure.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
// error-pattern:1 == 2
44
// xfail-test
5-
// no-valgrind
65
use std;
76
import std::task;
87
import std::comm::port;

0 commit comments

Comments
 (0)