Changeset 49d361 in git for Tst

Timestamp:

Apr 30, 1998, 9:40:10 AM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

4ed3317fbd9191af9799c82b127995dc2fe99db4

Parents:

8f0d304c9a165fcdc22365612d5836dfafc98d7e

Message:

*changed order of looking for result files: 1. uu then .res


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

File:

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

Tst/regress.cmd

@@ -2 +2 @@
 
 #################################################################
-# $Id: regress.cmd,v 1.6 1998-04-23 13:40:45 obachman Exp $
+# $Id: regress.cmd,v 1.7 1998-04-30 07:40:10 obachman Exp $
 # FILE:    regress.cmd 
 # PURPOSE: Script which runs regress test of Singular
@@ -82 +82 @@
     return (1);
   }
-  if ((! (-r "$root.res")) || (-z "$root.res"))
-  {
-    if ((! (-r "$root.res.gz")) || (-z "$root.res.gz"))
-    {
-      if ((! (-r "$root.res.gz.uu")) || (-z "$root.res.gz.uu"))
-      {
-        if ($generate ne "yes")
-        {
-          print (STDERR "Can not read $root.res[.gz]\n");
-          return (1);
-        }
-      }
-      else 
-      {
-        $exit_status 
-          = $exit_status || &mysystem("$uudecode -o $root.res.gz $root.res.gz.uu; $gunzip $root.res.gz");
-        if ($exit_status)
-        {
-          print (STDERR "Can not decode $root.res.gz.uu\n");
-          return ($exit_status);
-        }
-      }
-    }
-    else
-    {
-      $exit_status = $exit_status || & mysystem("$gunzip -f -c $root.res.gz > $root.res");
+  if ($generate ne "yes")
+  {
+    if ((-r "$root.res.gz.uu") && ! ( -z "$root.res.gz.uu"))
+    {
+      $exit_status 
+        = $exit_status || &mysystem("$uudecode -o $root.res.gz $root.res.gz.uu; $gunzip -f $root.res.gz");
       if ($exit_status)
       {
-        print (STDERR "Can not `$gunzip -f -c $root.res.gz > $root.res'\n" );
+        print (STDERR "Can not decode $root.res.gz.uu\n");
         return ($exit_status);
       }
+    }
+    elsif (! (-r "$root.res") || ( -z "$root.res"))
+    {
+      print (STDERR "Can not read $root.res[.gz.uu]\n");
+      return (1);
+      
     }
   }
@@ -172 +158 @@
   elsif ($generate eq "yes")
   {
-    & mysystem("$gzip -f $root.res; $uuencode $root.res.gz $root.res.gz > $root.res.gz.uu");
+    & mysystem("$gzip -f $root.res; $uuencode $root.res.gz $root.res.gz > $root.res.gz.uu; $rm -rf $root.res.gz");
     if ($keep eq "yes")
     {
       & mysystem("mv $root.new.res $root.res");
-    }
-    else
-    {
-      & mysystem("$rm -rf $root.new.res $root.res.gz");
     }
   }