diff --git a/cachegrind/tests/chdir.vgtest b/cachegrind/tests/chdir.vgtest index c91b4b673..041c5cf3d 100644 --- a/cachegrind/tests/chdir.vgtest +++ b/cachegrind/tests/chdir.vgtest @@ -1,2 +1,2 @@ prog: chdir -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/dlclose.vgtest b/cachegrind/tests/dlclose.vgtest index 353a3243a..d61200f94 100644 --- a/cachegrind/tests/dlclose.vgtest +++ b/cachegrind/tests/dlclose.vgtest @@ -1,3 +1,3 @@ prog: dlclose stderr_filter: filter_cachesim_discards -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/fpu-28-108.vgtest b/cachegrind/tests/x86/fpu-28-108.vgtest index 84d3bcff8..47c2606bc 100644 --- a/cachegrind/tests/x86/fpu-28-108.vgtest +++ b/cachegrind/tests/x86/fpu-28-108.vgtest @@ -1,3 +1,3 @@ prog: fpu-28-108 -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* cpu_test: x86 diff --git a/cachegrind/tests/x86/insn_basic.vgtest b/cachegrind/tests/x86/insn_basic.vgtest index 47724f979..9ab1b2160 100644 --- a/cachegrind/tests/x86/insn_basic.vgtest +++ b/cachegrind/tests/x86/insn_basic.vgtest @@ -1,3 +1,3 @@ vgopts: -q prog: ../../../none/tests/x86/insn_basic -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/insn_cmov.vgtest b/cachegrind/tests/x86/insn_cmov.vgtest index dfaedb37e..3d5d2bc2d 100644 --- a/cachegrind/tests/x86/insn_cmov.vgtest +++ b/cachegrind/tests/x86/insn_cmov.vgtest @@ -1,4 +1,4 @@ vgopts: -q prog: ../../../none/tests/x86/insn_cmov cpu_test: x86-cmov -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/insn_fpu.vgtest b/cachegrind/tests/x86/insn_fpu.vgtest index 260dcc247..486ce5869 100644 --- a/cachegrind/tests/x86/insn_fpu.vgtest +++ b/cachegrind/tests/x86/insn_fpu.vgtest @@ -1,4 +1,4 @@ vgopts: -q prog: ../../../none/tests/x86/insn_fpu cpu_test: x86-fpu -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/insn_mmx.vgtest b/cachegrind/tests/x86/insn_mmx.vgtest index 4699b4bbb..36dcc2063 100644 --- a/cachegrind/tests/x86/insn_mmx.vgtest +++ b/cachegrind/tests/x86/insn_mmx.vgtest @@ -1,4 +1,4 @@ vgopts: -q prog: ../../../none/tests/x86/insn_mmx cpu_test: x86-mmx -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/insn_mmxext.vgtest b/cachegrind/tests/x86/insn_mmxext.vgtest index 2dd2c72d0..96da64d19 100644 --- a/cachegrind/tests/x86/insn_mmxext.vgtest +++ b/cachegrind/tests/x86/insn_mmxext.vgtest @@ -1,4 +1,4 @@ vgopts: -q prog: ../../../none/tests/x86/insn_mmxext cpu_test: x86-mmxext -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/insn_sse.vgtest b/cachegrind/tests/x86/insn_sse.vgtest index 042f757a5..08837b637 100644 --- a/cachegrind/tests/x86/insn_sse.vgtest +++ b/cachegrind/tests/x86/insn_sse.vgtest @@ -1,4 +1,4 @@ vgopts: -q prog: ../../../none/tests/x86/insn_sse cpu_test: x86-sse -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/cachegrind/tests/x86/insn_sse2.vgtest b/cachegrind/tests/x86/insn_sse2.vgtest index 326f0e8b6..b0fe3e76a 100644 --- a/cachegrind/tests/x86/insn_sse2.vgtest +++ b/cachegrind/tests/x86/insn_sse2.vgtest @@ -1,4 +1,4 @@ vgopts: -q prog: ../../../none/tests/x86/insn_sse2 cpu_test: x86-sse2 -delete: cachegrind.out.* +cleanup: rm cachegrind.out.* diff --git a/massif/tests/true_html.vgtest b/massif/tests/true_html.vgtest index 7dfc68d82..b698a3e35 100644 --- a/massif/tests/true_html.vgtest +++ b/massif/tests/true_html.vgtest @@ -1,3 +1,3 @@ prog: ../../tests/true vgopts: --format=html -delete: massif.*.* +cleanup: rm massif.*.* diff --git a/massif/tests/true_text.vgtest b/massif/tests/true_text.vgtest index 79f9796c4..2df33d7a3 100644 --- a/massif/tests/true_text.vgtest +++ b/massif/tests/true_text.vgtest @@ -1,3 +1,3 @@ prog: ../../tests/true vgopts: --format=text -delete: massif.*.* +cleanup: rm massif.*.* diff --git a/memcheck/tests/badjump.vgtest b/memcheck/tests/badjump.vgtest index 6a8608959..f626a1b7f 100644 --- a/memcheck/tests/badjump.vgtest +++ b/memcheck/tests/badjump.vgtest @@ -1,2 +1,2 @@ prog: badjump -delete: vgcore.pid* +cleanup: rm vgcore.pid* diff --git a/memcheck/tests/scalar.vgtest b/memcheck/tests/scalar.vgtest index 05531938a..851e22b01 100644 --- a/memcheck/tests/scalar.vgtest +++ b/memcheck/tests/scalar.vgtest @@ -1,4 +1,4 @@ prog: scalar vgopts: -q --error-limit=no args: < scalar.c -delete: tmp_write_file_foo +cleanup: rm tmp_write_file_foo diff --git a/none/tests/x86/int.vgtest b/none/tests/x86/int.vgtest index 8f962a795..df0b93a11 100644 --- a/none/tests/x86/int.vgtest +++ b/none/tests/x86/int.vgtest @@ -1,3 +1,3 @@ prog: int stderr_filter: filter_int -delete: vgcore.pid* +cleanup: rm vgcore.pid* diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in index 676bbf859..7bb2d92cd 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in @@ -50,7 +50,7 @@ # - stdout_filter: (default: none) # - stderr_filter: (default: ./filter_stderr) # - cpu_test: (default: none) -# - delete: (default: none) +# - cleanup: (default: none) # # Note that filters are necessary for stderr results to filter out things that # always change, eg. process id numbers. @@ -83,7 +83,7 @@ my $args; # test prog args my $stdout_filter; # filter program to run stdout results file through my $stderr_filter; # filter program to run stderr results file through my $cpu_test; # cpu feature to check for before running test -my $delete; # file(s) to delete +my $cleanup; # cleanup command to run my @failures; # List of failed tests @@ -169,7 +169,7 @@ sub read_vgtest_file($) my ($f) = @_; # Defaults. - ($vgopts, $prog, $args, $stdout_filter, $stderr_filter, $cpu_test, $delete) + ($vgopts, $prog, $args, $stdout_filter, $stderr_filter, $cpu_test, $cleanup) = ("", undef, "", undef, undef, undef, undef); # Every test directory must have a "filter_stderr" @@ -190,8 +190,8 @@ sub read_vgtest_file($) $stderr_filter = validate_program(".", $1, 1, 1); } elsif ($line =~ /^\s*cpu_test:\s*(.*)$/) { $cpu_test = $1; - } elsif ($line =~ /^\s*delete:\s*(.*)$/) { - $delete = $1; + } elsif ($line =~ /^\s*cleanup:\s*(.*)$/) { + $cleanup = $1; } else { die "Bad line in $f: $line\n"; } @@ -297,8 +297,9 @@ sub do_one_test($$) do_diffs($fullname, $name, "stdout", \@stdout_exps); do_diffs($fullname, $name, "stderr", \@stderr_exps); - if (defined $delete) { - unlink(glob($delete)); + if (defined $cleanup) { + (system("$cleanup") == 0) or + print("(cleanup operation failed: $cleanup)\n"); } $num_tests_done++;