Changeset 6d01ca in git

Timestamp:

Dec 5, 2000, 3:26:27 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

fb6621e98cb726347270a24e92c13054fef3aed7

Parents:

ee7e8383100fa22353d12785c1e50be1f99bd4fb

Message:

* added support for timings


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

File:

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

Tst/regress.cmd

@@ -2 +2 @@
 
 #################################################################
-# $Id: regress.cmd,v 1.34 2000-11-08 17:07:13 obachman Exp $
+# $Id: regress.cmd,v 1.35 2000-12-05 14:26:27 obachman Exp $
 # FILE:    regress.cmd
 # PURPOSE: Script which runs regress test of Singular
@@ -20 +20 @@
   [-h]              -- print out help and exit
   [-k]              -- keep all intermediate files
-  [-v num]          -- set verbosity to num (used range 0..3, default: 1)
+  [-v num]          -- set verbosity to num (used range 0..4, default: 2)
   [-g]              -- generate result (*.res.gz.uu) files, only
   [-r [crit%[val]]] -- report if status differences [of crit] > val (in %)
@@ -29 +29 @@
   [-t]              -- compute and call system("mtrack", 1) at the end, no diffs
   [-tt max]         -- compute and call system("mtrack", max) at the end
+  [-T]              -- simply compute and determine timmings, no diffs
   [file.lst]        -- read tst files from file.lst
   [file.tst]        -- test Singular script file.tst
@@ -58 +59 @@
   $call =~ s/"/\\"/g;
   $call = "$sh -c \"$call\"";
-  print "$call\n" if ($verbosity > 1);
+  print "$call\n" if ($verbosity > 2);
   return (system $call);
 }
@@ -105 +106 @@
 $singularOptions = "--ticks-per-sec=100 -teqr12345678 --no-rc";
 $keep = "no";
-$verbosity = 1;
+$verbosity = 2;
 $generate = "no";
 $exit_code = 0;
@@ -372 +373 @@
   local($system_call, $exit_status, $ignore_pattern, $error_cause);
 
-  print "--- $root\n" unless ($verbosity == 0);
+  print "--- $root " unless ($verbosity == 0);
+  $total_checks++;
+  
   # check for existence/readablity of tst and res file
   if (! (-r "$root.tst"))
@@ -388 +391 @@
 
   # generate $root.res
-  if ($generate ne "yes" && ! defined($mtrack))
+  if ($generate ne "yes" && ! defined($mtrack) && !defined($timings_only))
   {
     if ((-r "$root.res.gz.uu") && ! ( -z "$root.res.gz.uu"))
@@ -413 +416 @@
   {
     $system_call = "$cat $root.tst | sed -e 's/\\\\\$/LIB \"general.lib\"; killall(); killall(\"proc\");kill killall;system(\"mtrack\", \"$root.mtrack.unused\", $mtrack); \\\$/' | $singular $singularOptions ";
-    $system_call .= ($verbosity > 2 ? " | $tee " : " > ");
+    $system_call .= ($verbosity > 3 ? " | $tee " : " > ");
     $system_call .= "$root.mtrack.res";
-    $system_call .= " 2>&1 " if ($verbosity <= 2);
+    $system_call .= " 2>&1 " if ($verbosity <= 3);
   }
   else
@@ -421 +424 @@
     
     # prepare Singular run
-    if ($verbosity > 2 && !$WINNT)
+    if ($verbosity > 3 && !$WINNT)
     {
       $system_call = "$cat $root.tst | $singular --execute 'string tst_status_file=\"$statfile\";' $singularOptions | $tee $resfile";
@@ -431 +434 @@
   }
   # Go Singular, Go!
+  
+  my ($user_t,$system_t,$cuser_t,$csystem_t) = times;
   $exit_status = &mysystem($system_call);
-
+  my ($user_t,$system_t,$cuser_t2,$csystem_t2) = times;
+  $cuser_t = $cuser_t2 - $cuser_t;
+  $csystem_t = $csystem_t2 - $csystem_t;
   if ($exit_status != 0)
   {
@@ -446 +453 @@
       $error_cause = "Segment fault";
     }
-    elsif (! defined($mtrack))
+    elsif (! defined($mtrack) && !defined($timings_only))
     {
       &mysystem("$rm -f $root.diff");
@@ -524 +531 @@
   }
   # und tschuess
+  unless ($verbosity == 0)
+  {
+    if ($verbosity > 1 || $timings_only)
+    {
+      my $used_time = $cuser_t + $csystem_t;
+      $total_used_time += $used_time;
+      $lst_used_time += $used_time;
+      print " " x (23 - length($root));
+      printf("%.2f", $used_time);
+    }
+    print " \n";
+  }
+  $total_checks_pass++ unless $exit_code;
   return ($exit_status);
 }
@@ -564 +584 @@
   {
     $mtrack = 1;
+  }
+  elsif (/^-T/)
+  {
+    $timings_only = 1;
   }
   elsif(/^-r$/)
@@ -701 +725 @@
     $base = $2;
     chdir($path);
-    print "cd $path\n" if ($verbosity > 1);
+    print "cd $path\n" if ($verbosity > 2);
   }
   else
@@ -717 +741 @@
   elsif ($extension eq "lst")
   {
+    
     if (! open(LST_FILE, "<$file"))
     {
@@ -723 +748 @@
       next;
     }
+    $lst_used_time = 0;
+    $lst_checks = 0;
+    $lst_checks_pass = 0;
     while (<LST_FILE>)
     {
@@ -739 +767 @@
         $tst_base = $2;
         chdir($tst_path);
-        print "cd $tst_path\n" if ($verbosity > 1);
+        print "cd $tst_path\n" if ($verbosity > 2);
       }
       else
@@ -748 +776 @@
       $tst_base =~ s/^\s*//;
       $tst_base =~ s/(.*?)\s+.*/$1/;
-      $exit_code = &tst_check($tst_base) || $exit_code;
+      $lst_checks++;
+      my $this_exit_code = &tst_check($tst_base);
+      $lst_checks_pass++ unless $this_exit_code;
+      $exit_code = $this_exit_code || $exit_code;
 
       if ($tst_path ne "")
       {
         chdir($tst_curr_dir);
-        print "cd $tst_curr_dir\n" if ($verbosity > 1);
+        print "cd $tst_curr_dir\n" if ($verbosity > 2);
       }
     }
     close (LST_FILE);
+    printf("$base Summary: Checks:$lst_checks Failed:%d Time:%.2f\n", $lst_checks - $lst_checks_pass, $lst_used_time) 
+      unless ($verbosity < 2)
   }
   else
@@ -766 +799 @@
   {
     chdir($curr_dir);
-    print "cd $curr_dir\n" if ($verbosity > 1);
-  }
+    print "cd $curr_dir\n" if ($verbosity > 2);
+  }
+}
+
+unless ($verbosity < 2 || $lst_checks == $total_checks)
+{
+  printf("Summary: Checks:$total_checks Failed:%d Time:%.2f\n", $total_checks - $total_checks_pass, $total_used_time);
 }