Changeset e45fd3 in git for Tst/regress.cmd

Timestamp:

Oct 27, 1998, 6:31:21 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

85c8634a283105981871af90f7a0b4842d2221cf

Parents:

62bc0ac779982230625bd5dccd75117ede60ef04

Message:

* only stat files


git-svn-id: file:///usr/local/Singular/svn/trunk@2603 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Tst/regress.cmd (modified) (7 diffs)

Tst/regress.cmd

@@ -2 +2 @@
 
 #################################################################
-# $Id: regress.cmd,v 1.24 1998-07-14 14:18:31 obachman Exp $
+# $Id: regress.cmd,v 1.25 1998-10-27 17:31:13 obachman Exp $
 # FILE:    regress.cmd 
 # PURPOSE: Script which runs regress test of Singular
@@ -105 +105 @@
 }
 # sed scripts which are applied to res files before they are diff'ed
-$sed_scripts = "-e '/used time:/d' -e '/tst_ignore:/d' -e '/Id:/d'";
+$sed_scripts = "-e '/used time:/d' -e '/tst_ignore:/d' -e '/Id:/d' -e '/error occurred in/d'";
 # default value (in %) above which differences are reported on -r
 $report_val = 5;
@@ -197 +197 @@
   local($line,$new_line,$prefix,$crit,$res,$new_res);
   local($res_diff,$res_diff_pc,$res_diff_line);
-  local($exit_status) = 0;
+  local($exit_status, $reported) = (0, 0);
   local($error_cause) = "";
   
@@ -209 +209 @@
   $new_line = <NEW_RES_FILE>;
   $line = <RES_FILE>;
+  
   while ($line && $new_line)
   {
@@ -224 +225 @@
         $res_diff_line =
           "$prefix >> $crit :: new:$new_res old:$res diff:$res_diff %:$res_diff_pc";
-        print (STATUS_DIFF_FILE "$res_diff_line\n") 
-          if ((defined($error{$crit}) &&  $error{$crit}<abs($res_diff_pc)) 
+        if ((defined($error{$crit}) &&  $error{$crit}<abs($res_diff_pc)) 
               || 
-              (defined($report{$crit}) && $report{$crit}<abs($res_diff_pc)));
-        
-        print "$res_diff_line\n"
-          if ($verbosity > 0 &&
-              ((defined($error{$crit}) &&  $error{$crit}<abs($res_diff_pc)) 
-              || 
-              (defined($report{$crit}) && $report{$crit}<abs($res_diff_pc))));
+            (defined($report{$crit}) && $report{$crit}<abs($res_diff_pc)))
+        {
+          $reported = 1;
+          print (STATUS_DIFF_FILE "$res_diff_line\n");
+          print "$res_diff_line\n" if ($verbosity > 0);
+        }
 
         if ($exit_status == 0)
@@ -251 +250 @@
   close(STATUS_DIFF_FILE);
   mysystem("rm -f $root.stat.sdiff")
-    if ($exit_status == 0 && $keep ne "yes");
-  
+    if ($reported == 0 &&  $exit_status == 0 && $keep ne "yes");
   return ($exit_status, $error_cause);
 }
@@ -447 +445 @@
     if ($keep ne "yes")
     {
-      &mysystem("$rm -f tst_status.out $root.new.res $root.res $root.*diff $root.new.stat");
+      &mysystem("$rm -f tst_status.out $root.new.res $root.res $root.diff $root.new.stat");
     } 
   }