Changeset 6b8aae5 in git

Timestamp:

Jul 1, 1998, 12:39:10 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '6e12f9861a9fbafef8cfe9d754bf74a7d483a67b')

Children:

6d7a86a59473bc99949cb0e2ec4f38d7e3eec49c

Parents:

46976a68b5b1ef847ae27a04683148c9e8acb851

Message:

* better tst_status support


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

File:

• Singular/LIB/tst.lib (modified) (7 diffs)

Singular/LIB/tst.lib

@@ -1 @@
-// $Id: tst.lib,v 1.9 1998-06-30 14:48:21 obachman Exp $
+// $Id: tst.lib,v 1.10 1998-07-01 10:39:10 obachman Exp $
 //(obachman, last modified 6/30/98)
 /////////////////////////////////////////////////////////////////////////////
 
-version="$Id: tst.lib,v 1.9 1998-06-30 14:48:21 obachman Exp $";
+version="$Id: tst.lib,v 1.10 1998-07-01 10:39:10 obachman Exp $";
 info="
 LIBRARY:  tst.lib      PROCEDURES FOR RUNNING AUTOMATIC TST TESTS
@@ -10 +10 @@
  tst_system(s)          returns string which is stdout of system(\"sh\", s)
  tst_ignore(any,[keyword], [link]) writes string(any) to link (or stdout),
-                                   prepending prefix \"// ignore:\"
+                                   prepending prefix \"// tst_ignore:\"
  tst_init()             writes some identification data to stdout
                         with tst_ignore
@@ -43 +43 @@
 }
 
+proc GetHostName
+{
+  string tst_hostname = tst_system("hostname");
+  tst_hostname = tst_hostname[1..size(tst_hostname)-1];
+  return (tst_hostname);
+}
 
 proc tst_ignore
@@ -50 +56 @@
             link    -- a link which can be written to
 RETURN:   none; writes string(any) to link (or stdout, if no link given),
-          prepending prefix \"// ignore:\", or 
-                            \"// ignore:keyword hostname:\",
+          prepending prefix \"// tst_ignore:\", or 
+                            \"// tst_ignore:keyword hostname:\",
                             if keyword was given.
           Should be used in tst files to output system dependent data
@@ -113 +119 @@
   if (keyword != "")
   {
-    if (! defined(tst_hostname))
-    {
-      string tst_hostname = tst_system("hostname");
-      tst_hostname = tst_hostname[1..size(tst_hostname)-1];
-      export tst_hostname;
-    }
-
-    write(outlink, "// ignore:" + keyword + " " + tst_hostname + ":" + s);
+    write(outlink,"// tst_ignore:" + keyword + " " + GetHostName() + ":" + s);
   }
   else
   {
-    write(outlink, "// ignore: " + s);
+    write(outlink, "// tst_ignore: " + s);
   }
 }
@@ -140 +139 @@
 }
 
+static proc Get_tst_timer
+{
+  if (! defined (tst_timer))
+  {
+    string tst_timer = "// tst_ignore:0";
+    export tst_timer;
+    return (0);
+  }
+  else
+  {
+    execute "int tst_int_timer = " + tst_timer[15,size(tst_timer)] + ";";
+    return (tst_int_timer);
+  }
+}
+
+static proc Set_tst_timer (int this_time)
+{
+  tst_timer = tst_timer[1,14] + string(this_time);
+}
+
 proc tst_status (list #)
 "USAGE:   tst_status([any])
@@ -159 +178 @@
   else
   {
-    if (! defined(tst_timer))
-    {
-      int tst_timer = 0;
-      export tst_timer;
-    }
-    tst_ignore(timer - tst_timer, "tst_timer");
-    tst_timer = timer;
+    tst_ignore(timer - Get_tst_timer(), "tst_timer");
+    Set_tst_timer(timer);
   }
 }