Changeset 9a50a2 in git for Tst/regress.cmd

Timestamp:

Oct 22, 1999, 1:12:50 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'b324714bf5073469800caef737deba1366fbd81f')

Children:

4779934d50b14b0a5161605c33419f8b20bf441d

Parents:

928efb07b9136e43d71d0fc54a77ded832a005be

Message:

* option -t which generates $root.matrack.unused and does not check
  correctness


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

File:

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

Tst/regress.cmd

@@ -2 +2 @@
 
 #################################################################
-# $Id: regress.cmd,v 1.27 1999-09-27 11:06:29 obachman Exp $
+# $Id: regress.cmd,v 1.28 1999-10-22 11:12:50 obachman Exp $
 # FILE:    regress.cmd
 # PURPOSE: Script which runs regress test of Singular
@@ -25 +25 @@
   [-e [crit%[val]]] -- throw error if status difference [of crit] > val (in %)
   [-m [crit]]       -- merge status results [of crit] into result file
+  [-t]              -- compute and call mtrack at the end, no diffs
   [file.lst]        -- read tst files from file.lst
   [file.tst]        -- test Singular script file.tst
@@ -329 +330 @@
 
   # generate $root.res
-  if ($generate ne "yes")
+  if ($generate ne "yes" && ! $mtrack)
   {
     if ((-r "$root.res.gz.uu") && ! ( -z "$root.res.gz.uu"))
@@ -347 +348 @@
   }
 
-  # prepare Singular run
   &mysystem("$rm -f tst_status.out");
-  if ($verbosity > 2 && !$WINNT)
-  {
-    $system_call = "$cat $root.tst | $singular $singularOptions | $tee $root.new.res";
+  my $resfile = "$root.new.res";
+  $resfile = "$root.mtrack.res" if ($mtrack);
+  
+  if ($mtrack)
+  {
+    $system_call = "$cat $root.tst | sed -e 's/\\\\\$/LIB \"general.lib\"; killall(); killall(\"proc\");system(\"mtrack\", \"$root.mtrack.unused\"); \\\$/' | $singular $singularOptions ";
+    $system_call .= ($verbosity > 2 ? " | $tee " : " > ");
+    $system_call .= "$root.mtrack.res";
+    $system_call .= " 2>&1 " if ($verbosity <= 2);
   }
   else
   {
-    $system_call = "$cat $root.tst | $singular $singularOptions > $root.new.res 2>&1";
+    # prepare Singular run
+    if ($verbosity > 2 && !$WINNT)
+    {
+      $system_call = "$cat $root.tst | $singular $singularOptions | $tee $resfile";
+    }
+    else
+    {
+      $system_call = "$cat $root.tst | $singular $singularOptions > $resfile 2>&1";
+    }
   }
   # Go Singular, Go!
@@ -367 +381 @@
   {
     # check for Segment fault in res file
-    $exit_status = ! (&mysystem("$grep \"Segment fault\" $root.new.res > /dev/null 2>&1"));
+    $exit_status = ! (&mysystem("$grep \"Segment fault\" $resfile > /dev/null 2>&1"));
 
     if ($exit_status)
@@ -373 +387 @@
       $error_cause = "Segment fault";
     }
-    else
+    elsif (! $mtrack)
     {
       &mysystem("$rm -f $root.diff");
       if ($generate eq "yes")
       {
-        &mysystem("$cp $root.new.res $root.res");
+        &mysystem("$cp $resfile $root.res");
       }
       else
@@ -396 +410 @@
   }
 
-  if (%checks && ! $exit_status && $generate ne "yes")
+  if (%checks && ! $exit_status && $generate ne "yes" && ! $mtrack)
   {
     & mysystem("$cp tst_status.out $root.new.stat");
@@ -411 +425 @@
   else
   {
-
-    #clean up
-    if ($generate eq "yes")
-    {
-      & mysystem("$cp tst_status.out $root.stat");
-      if (! $WINNT)
-      {
-        &mysystem("$gzip -cf $root.res | $uuencode $root.res.gz > $root.res.gz.uu");
-      }
-      else
-      {
-        # uuencode is broken under windows
-        print "Warning: Can not generate $root.res.gz.uu under Windows\n";
-      }
-
-    }
-    elsif (%merge)
-    {
-      if (! -r "$root.stat")
-      {
-        & mysystem("$cp tst_status.out $root.stat");
-      }
-      else
-      {
-        & mysystem("$cp tst_status.out $root.new.stat");
-        ($exit_status, $error_cause) = & tst_status_merge($root);
-
-        print (STDERR "Warning: Merge Problems: $error_cause\n")
-          if ($verbosity > 0 && $exit_status);
-      }
-    }
-
+    unless ($mtrack)
+    {
+      #clean up
+      if ($generate eq "yes")
+      {
+        & mysystem("$cp tst_status.out $root.stat");
+        if (! $WINNT)
+        {
+          &mysystem("$gzip -cf $root.res | $uuencode $root.res.gz > $root.res.gz.uu");
+        }
+        else
+        {
+          # uuencode is broken under windows
+          print "Warning: Can not generate $root.res.gz.uu under Windows\n";
+        }
+        
+      }
+      elsif (%merge)
+      {
+        if (! -r "$root.stat")
+        {
+          & mysystem("$cp tst_status.out $root.stat");
+        }
+        else
+        {
+          & mysystem("$cp tst_status.out $root.new.stat");
+          ($exit_status, $error_cause) = & tst_status_merge($root);
+          
+          print (STDERR "Warning: Merge Problems: $error_cause\n")
+            if ($verbosity > 0 && $exit_status);
+        }
+      }
+    }
     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 $resfile $root.res $root.diff $root.new.stat");
+    }
+  }
   # und tschuess
   return ($exit_status);
@@ -482 +496 @@
   {
     $verbosity = shift;
+  }
+  elsif(/^-t$/)
+  {
+    $mtrack = 1;
   }
   elsif(/^-r$/)
@@ -659 +677 @@
         $tst_base = $_;
       }
-
+      $tst_base =~ s/^\s*//;
+      $tst_base =~ s/(.*?)\s+.*/$1/;
       $exit_code = &tst_check($tst_base) || $exit_code;