Add a "delete:" line to the regression test .vgtest files, to clean up any file

created by the test.  Added appropriate lines to the Cachegrind and Massif
tests.  Should prevent large numbers of files clogging up directories.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2372

diff --git a/cachegrind/tests/chdir.vgtest b/cachegrind/tests/chdir.vgtest
index 6629f224270f32428f040a8388fa46314796f8de..c91b4b673f5cf7a1c588ea7d3125dcc88a305c7e 100644 (file)
--- a/cachegrind/tests/chdir.vgtest
+++ b/cachegrind/tests/chdir.vgtest
@@ -1 +1,2 @@
 prog: chdir
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/dlclose.vgtest b/cachegrind/tests/dlclose.vgtest
index b0bf0e4a4cb772e7ec3c673823536c0abb83668a..353a3243aff9908ce13917a7af42118f59a9059f 100644 (file)
--- a/cachegrind/tests/dlclose.vgtest
+++ b/cachegrind/tests/dlclose.vgtest
@@ -1,2 +1,3 @@
 prog: dlclose
 stderr_filter: filter_cachesim_discards
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/fpu-28-108.vgtest b/cachegrind/tests/fpu-28-108.vgtest
index c8e3e9c2ab9ce0ffb7b8f889258ca79c68579b9b..48cc454c895d3ede99c80d27991f19c992ea1d36 100644 (file)
--- a/cachegrind/tests/fpu-28-108.vgtest
+++ b/cachegrind/tests/fpu-28-108.vgtest
@@ -1 +1,2 @@
 prog: fpu-28-108
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_basic.vgtest b/cachegrind/tests/insn_basic.vgtest
index f5329ea810b6a287766820f6419d7fa6e45d4313..a6efda61c1a15ab4b106e6931847adb7240ed7f3 100644 (file)
--- a/cachegrind/tests/insn_basic.vgtest
+++ b/cachegrind/tests/insn_basic.vgtest
@@ -1,2 +1,3 @@
 vgopts: -q
 prog: ../../none/tests/insn_basic
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_cmov.vgtest b/cachegrind/tests/insn_cmov.vgtest
index 0321a3ca8461ad4bd7f85a4261f2696ba19c22be..c020cbf4740104d36b6f3a8c6a8503f1f2dab066 100644 (file)
--- a/cachegrind/tests/insn_cmov.vgtest
+++ b/cachegrind/tests/insn_cmov.vgtest
@@ -1,3 +1,4 @@
 vgopts: -q
 prog: ../../none/tests/insn_cmov
 cpu_test: cmov
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_fpu.vgtest b/cachegrind/tests/insn_fpu.vgtest
index 1b9546f54ab2e5194bc6016a2ce8feed3515a188..eb7c9ac4fb2066d543525e7c610d48ecbccbaf2e 100644 (file)
--- a/cachegrind/tests/insn_fpu.vgtest
+++ b/cachegrind/tests/insn_fpu.vgtest
@@ -1,3 +1,4 @@
 vgopts: -q
 prog: ../../none/tests/insn_fpu
 cpu_test: fpu
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_mmx.vgtest b/cachegrind/tests/insn_mmx.vgtest
index ddbb97726363c403da8a25af5b5f21e407e29a17..504558cf6390b36301f5e4ec6eb13690ee2dece4 100644 (file)
--- a/cachegrind/tests/insn_mmx.vgtest
+++ b/cachegrind/tests/insn_mmx.vgtest
@@ -1,3 +1,4 @@
 vgopts: -q
 prog: ../../none/tests/insn_mmx
 cpu_test: mmx
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_mmxext.vgtest b/cachegrind/tests/insn_mmxext.vgtest
index bb667097fb37c582079ff8013cad3925755a6a00..30a705f33aae11adae2a55112bed7eac18aa932c 100644 (file)
--- a/cachegrind/tests/insn_mmxext.vgtest
+++ b/cachegrind/tests/insn_mmxext.vgtest
@@ -1,3 +1,4 @@
 vgopts: -q
 prog: ../../none/tests/insn_mmxext
 cpu_test: mmxext
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_sse.vgtest b/cachegrind/tests/insn_sse.vgtest
index 167c8e290b5f48ee6a5c083a527fa3e0625df84c..8dded750a7cb17d31edc64d7157c5438b1ebb44e 100644 (file)
--- a/cachegrind/tests/insn_sse.vgtest
+++ b/cachegrind/tests/insn_sse.vgtest
@@ -1,3 +1,4 @@
 vgopts: -q
 prog: ../../none/tests/insn_sse
 cpu_test: sse
+delete: cachegrind.out.*

diff --git a/cachegrind/tests/insn_sse2.vgtest b/cachegrind/tests/insn_sse2.vgtest
index 42e82f38d30d069e768574ce0ab347ae31004e0a..594a3fd2ab872f1d4e26fca6ff4d84673c3fd87a 100644 (file)
--- a/cachegrind/tests/insn_sse2.vgtest
+++ b/cachegrind/tests/insn_sse2.vgtest
@@ -1,3 +1,4 @@
 vgopts: -q
 prog: ../../none/tests/insn_sse2
 cpu_test: sse2
+delete: cachegrind.out.*

diff --git a/massif/tests/true_html.vgtest b/massif/tests/true_html.vgtest
index 8d568359d5321dc2fdd9f85d32c7b907216b1b5a..7dfc68d82323b2c7f754e0e6e00a7d27b8f878a7 100644 (file)
--- a/massif/tests/true_html.vgtest
+++ b/massif/tests/true_html.vgtest
@@ -1,2 +1,3 @@
 prog: ../../tests/true
 vgopts: --format=html
+delete: massif.*.*

diff --git a/massif/tests/true_text.vgtest b/massif/tests/true_text.vgtest
index 841ae1f1536def75b337cc049ad96e7cd79dd16a..79f9796c44771d58bfc81dbea61aa78729dfd217 100644 (file)
--- a/massif/tests/true_text.vgtest
+++ b/massif/tests/true_text.vgtest
@@ -1,2 +1,3 @@
 prog: ../../tests/true
 vgopts: --format=text
+delete: massif.*.*

diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 98c04f63f6e59fe6f312f00586b4475ba2d2045a..a3b1e57bd8ddaebe80f9869ad3b82e443be88a15 100755 (executable)
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -50,6 +50,7 @@
 #   - stdout_filter: <filter to run stdout through> (default: none)
 #   - stderr_filter: <filter to run stderr through> (default: ./filter_stderr)
 #   - cpu_test: <cpu feature required for test>     (default: none)
+#   - delete: <created file(s) to delete>           (default: none)
 #
 # Note that filters are necessary for stderr results to filter out things that
 # always change, eg. process id numbers.
@@ -82,6 +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 @failures;           # List of failed tests
 
@@ -167,8 +169,8 @@ sub read_vgtest_file($)
     my ($f) = @_;
 
     # Defaults.
-    ($vgopts, $prog, $args, $stdout_filter, $stderr_filter, $cpu_test) = 
-        ("", undef, "", undef, undef, undef);
+    ($vgopts, $prog, $args, $stdout_filter, $stderr_filter, $cpu_test, $delete)
+      = ("", undef, "", undef, undef, undef, undef);
 
     # Every test directory must have a "filter_stderr"
     $stderr_filter = validate_program(".", $default_stderr_filter, 1);
@@ -188,6 +190,8 @@ sub read_vgtest_file($)
             $stderr_filter = validate_program(".", $1, 1);
         } elsif ($line =~ /^\s*cpu_test:\s*(.*)$/) {
             $cpu_test = $1;
+        } elsif ($line =~ /^\s*delete:\s*(.*)$/) {
+            $delete = $1;
         } else {
             die "Bad line in $f: $line\n";
         }
@@ -289,6 +293,11 @@ sub do_one_test($$)
     
     do_diffs($fullname, $name, "stdout", \@stdout_exps); 
     do_diffs($fullname, $name, "stderr", \@stderr_exps); 
+ 
+    if (defined $delete) {
+        unlink(glob($delete));
+    }
+
     $num_tests_done++;
 }