Changeset d66b1f0 in git

Timestamp:

Jul 27, 2009, 9:31:16 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

d3ce3f1ac00df7b7eb45cc1b46a0e91829044810

Parents:

6a124684c584509ebdfbe2be941f871756c56dec

Message:

*motsak: added processing of lists within lists


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

File:

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

Tst/regress.cmd

@@ -2 +2 @@
 
 #################################################################
-# $Id: regress.cmd,v 1.40 2009-02-12 15:42:38 motsak Exp $
+# $Id: regress.cmd,v 1.41 2009-07-27 19:31:16 motsak Exp $
 # FILE:    regress.cmd
 # PURPOSE: Script which runs regress test of Singular
@@ -717 +717 @@
 }
 
-
-# now do the work
-foreach (@ARGV)
-{
+sub file_check
+{
+  local($t)= $_[0];
+  print( "Processing: $t\n");
 
   if ( /^(.*)\.([^\.\/]*)$/ )
@@ -732 +732 @@
     $path = $1;
     $base = $2;
+
+    local($pwd);
+    chop($pwd=`pwd`);
+
     chdir($path);
     print "cd $path\n" if ($verbosity > 2);
@@ -749 +753 @@
   elsif ($extension eq "lst")
   {
-    
     if (! open(LST_FILE, "<$file"))
     {
@@ -763 +766 @@
       if (/^;/)          # ignore lines starting with ;
       {
-        print unless ($verbosity == 0);
+          print unless ($verbosity == 0);
         next;
       }
       next if (/^\s*$/); #ignore whitespaced lines
-      chop if (/\n$/);   #chop of \n
-
-      $_ = $1 if (/^(.*)\.([^\.\/]*)$/ ); # chop of extension
+      chop;   #chop of \n
+
+      $t = $_;
+
+      if ( /^(.*)\.([^\.\/]*)$/ )
+      {
+        $_ = $1; # chop of extension
+
+        if( $2 eq "lst")
+        {
+          print("going... recursive into: $t!\n");
+          file_check("$t");
+          next;
+        }
+      } 
+#     $_ = $1 if (/^(.*)\.([^\.\/]*)$/ ); 
+
       if ( /^(.*)\/([^\/]*)$/ )
       {
@@ -796 +813 @@
     }
     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
@@ -806 +821 @@
   if ($path ne "")
   {
-    chdir($curr_dir);
+    chdir($pwd);
     print "cd $curr_dir\n" if ($verbosity > 2);
   }
 }
+
+
+# now do the work
+foreach (@ARGV)
+{
+  file_check($_);
+}
+
+printf("$base Summary: Checks:$lst_checks Failed:%d Time:%.2f\n", $lst_checks - $lst_checks_pass, $lst_used_time) 
+  unless ($verbosity < 2);
+
 
 unless ($verbosity < 2 || $lst_checks == $total_checks)