From d82ee0453307890d36a7a126fb982591d48654ab Mon Sep 17 00:00:00 2001 From: Rose Thompson Date: Wed, 7 Feb 2024 11:39:05 -0600 Subject: [PATCH] Finally have regression-wally doing everything! --- sim/regression-wally | 2 +- sim/wally-batch.do | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sim/regression-wally b/sim/regression-wally index 3c02ae96e..d06ac0b28 100755 --- a/sim/regression-wally +++ b/sim/regression-wally @@ -295,7 +295,7 @@ if (nightly): tc = TestCase( name=t, variant=config, - cmd=cmdPrefix+" "+t+" configOption "+configOptions+"\n!", + cmd=cmdPrefix+" "+t+" configOptions "+configOptions+"\n!", grepstr="All tests ran without failures") configs.append(tc) diff --git a/sim/wally-batch.do b/sim/wally-batch.do index 977fda6d7..6a334b103 100644 --- a/sim/wally-batch.do +++ b/sim/wally-batch.do @@ -21,18 +21,10 @@ onbreak {resume} # create library -if {$2 eq "configOptions"} { - if [file exists wkdir/work_${1}_${3}_${4}] { - vdel -lib wkdir/work_${1}_${3}_${4} -all - } - vlib wkdir/work_${1}_${3}_${4} - -} else { - if [file exists wkdir/work_${1}_${2}] { - vdel -lib wkdir/work_${1}_${2} -all - } - vlib wkdir/work_${1}_${2} +if [file exists wkdir/work_${1}_${2}] { + vdel -lib wkdir/work_${1}_${2} -all } +vlib wkdir/work_${1}_${2} # Create directory for coverage data mkdir -p cov @@ -51,6 +43,7 @@ for {set i 0} true {incr i} { set arg [expr "$$x"] lappend lst $arg } + if {$argc >= 3} { if {$3 eq "-coverage" || ($argc >= 7 && $7 eq "-coverage")} { set coverage 1 @@ -58,7 +51,6 @@ if {$argc >= 3} { set configOptions $lst puts $configOptions } - } # compile source files