From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Sat, 17 Apr 2004 17:25:08 +0000 (+0000)
Subject: Add a "delete:" line to the regression test .vgtest files, to clean up any file
X-Git-Tag: svn/VALGRIND_2_1_2~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fc96dcc0637631580b61ebac69b07be0d716503;p=thirdparty%2Fvalgrind.git

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 6629f22427..c91b4b673f 100644
--- 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 b0bf0e4a4c..353a3243af 100644
--- 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 c8e3e9c2ab..48cc454c89 100644
--- 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 f5329ea810..a6efda61c1 100644
--- 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 0321a3ca84..c020cbf474 100644
--- 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 1b9546f54a..eb7c9ac4fb 100644
--- 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 ddbb977263..504558cf63 100644
--- 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 bb667097fb..30a705f33a 100644
--- 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 167c8e290b..8dded750a7 100644
--- 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 42e82f38d3..594a3fd2ab 100644
--- 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 8d568359d5..7dfc68d823 100644
--- 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 841ae1f153..79f9796c44 100644
--- 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 98c04f63f6..a3b1e57bd8 100755
--- 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++;
 }