Changeset 0b20296 in git for Tst/regress.cmd


Ignore:
Timestamp:
Nov 8, 2000, 6:07:13 PM (23 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
555397792c6e9a9792be82b77099fe420cbb7d01
Parents:
4d0d5a573af9cb00e22de0c9546eca8f64f2b867
Message:
* filter for new stuff in option(prot)


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

Legend:

Unmodified
Added
Removed
  • Tst/regress.cmd

    r4d0d5a5 r0b20296  
    22
    33#################################################################
    4 # $Id: regress.cmd,v 1.33 2000-09-04 13:49:23 obachman Exp $
     4# $Id: regress.cmd,v 1.34 2000-11-08 17:07:13 obachman Exp $
    55# FILE:    regress.cmd
    66# PURPOSE: Script which runs regress test of Singular
     
    2727  [-a [crit]]       -- add status results [of crit] to result file
    2828  [-m]              -- add status result for current version to result file
    29   [-t]              -- compute and call mtrack at the end, no diffs
     29  [-t]              -- compute and call system("mtrack", 1) at the end, no diffs
     30  [-tt max]         -- compute and call system("mtrack", max) at the end
    3031  [file.lst]        -- read tst files from file.lst
    3132  [file.tst]        -- test Singular script file.tst
     
    116117}
    117118# sed scripts which are applied to res files before they are diff'ed
    118 $sed_scripts = "-e '/used time:/d' -e '/tst_ignore:/d' -e '/Id:/d' -e '/error occurred in/d' -e '/tst_status/d' -e'/init >>/d'";
     119$sed_scripts = "-e '/used time:/d' -e '/tst_ignore:/d' -e '/Id:/d' -e '/error occurred in/d' -e '/tst_status/d' -e'/init >>/d' -e 's/\\[[0-9]*:[0-9]*\\]//g'";
    119120# default value (in %) above which differences are reported on -r
    120121$report_val = 5;
     
    387388
    388389  # generate $root.res
    389   if ($generate ne "yes" && ! $mtrack)
     390  if ($generate ne "yes" && ! defined($mtrack))
    390391  {
    391392    if ((-r "$root.res.gz.uu") && ! ( -z "$root.res.gz.uu"))
     
    406407
    407408  my $resfile = "$root.new.res";
    408   $resfile = "$root.mtrack.res" if ($mtrack);
     409  $resfile = "$root.mtrack.res" if (defined($mtrack));
    409410  my $statfile = "$root.new.stat";
    410411  &mysystem("$rm -f $statfile");
    411   if ($mtrack)
    412   {
    413     $system_call = "$cat $root.tst | sed -e 's/\\\\\$/LIB \"general.lib\"; killall(); killall(\"proc\");kill killall;system(\"mtrack\", \"$root.mtrack.unused\"); \\\$/' | $singular $singularOptions ";
     412  if (defined($mtrack))
     413  {
     414    $system_call = "$cat $root.tst | sed -e 's/\\\\\$/LIB \"general.lib\"; killall(); killall(\"proc\");kill killall;system(\"mtrack\", \"$root.mtrack.unused\", $mtrack); \\\$/' | $singular $singularOptions ";
    414415    $system_call .= ($verbosity > 2 ? " | $tee " : " > ");
    415416    $system_call .= "$root.mtrack.res";
     
    445446      $error_cause = "Segment fault";
    446447    }
    447     elsif (! $mtrack)
     448    elsif (! defined($mtrack))
    448449    {
    449450      &mysystem("$rm -f $root.diff");
     
    471472    if (! -e $statfile && -e "tst_status.out");
    472473
    473   if (%checks && ! $exit_status && $generate ne "yes" && ! $mtrack)
     474  if (%checks && ! $exit_status && $generate ne "yes" && ! defined($mtrack))
    474475  {
    475476    if (-e "$statfile")
     
    492493  else
    493494  {
    494     unless ($mtrack)
     495    unless (defined($mtrack))
    495496    {
    496497      #clean up
     
    556557    $verbosity = shift;
    557558  }
     559  elsif (/^-tt/)
     560  {
     561    $mtrack = shift;
     562  }
    558563  elsif(/^-t$/)
    559564  {
Note: See TracChangeset for help on using the changeset viewer.