- fix regression tests counting
- unset $VALGRIND_OPTS (fixes 6 testsuite failures)


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1545 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 914a0dd..785b6dd 100755
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -251,8 +251,8 @@
         } else {
             unlink("$name.$ext.out", "$name.$ext.diff");
         }
+        $num_tests_done++;
     }
-    $num_tests_done++;
 }
 
 #----------------------------------------------------------------------------
@@ -319,12 +319,8 @@
 # main(), sort of
 #----------------------------------------------------------------------------
 
-# undefine $VALGRIND_OPTS
-# (Commented out 2002-Oct-30;  was causing "Use of uninitialized value in undef
-#  operator" warning  --njn)
-# if ( exists $ENV{VALGRIND_OPTS} ) {
-#   undef $ENV{VALGRIND_OPTS};
-# }
+# nuke VALGRIND_OPTS
+$ENV{"VALGRIND_OPTS"} = "";
 
 my @fs = process_command_line();
 foreach my $f (@fs) {