From f126576dd6ace77889cd9ffeeccd8b270e3c7e94 Mon Sep 17 00:00:00 2001 From: vijay_ganesh Date: Tue, 22 Sep 2009 16:46:44 +0000 Subject: [PATCH] fixed the regression scripts so that we can run them one after another with one command git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@248 e59a4935-1847-0410-ae03-e826735625c1 --- scripts/run_bigarray_tests.pl | 57 +-------------------------------- scripts/run_cvc_tests.pl | 58 ++-------------------------------- scripts/run_stp_tests.pl | 59 ++--------------------------------- 3 files changed, 5 insertions(+), 169 deletions(-) diff --git a/scripts/run_bigarray_tests.pl b/scripts/run_bigarray_tests.pl index 4656ac8..9e81486 100755 --- a/scripts/run_bigarray_tests.pl +++ b/scripts/run_bigarray_tests.pl @@ -91,61 +91,6 @@ my @stpOptions = (); # State is either "own" or "stp", meaning that we're reading either # our own or stp's options. my $argState = "own"; -# for(my $i=0; $i <= $#ARGV; $i++) { -# if($argState eq "own") { -# if($ARGV[$i] eq "--") { $argState = "stp"; } -# elsif($ARGV[$i] eq "-h") { print($usageString, "\n"); exit 0; } -# elsif($ARGV[$i] eq "+rt") { $options{'rt'} = 1; } -# elsif($ARGV[$i] eq "-rt") { $options{'rt'} = 0; } -# elsif($ARGV[$i] eq "+proofs") { $options{'proofs'} = 1; } -# elsif($ARGV[$i] eq "-proofs") { $options{'proofs'} = 0; } -# elsif($ARGV[$i] eq "-v") { $options{'verbose'} = 1; } -# elsif($ARGV[$i] eq "-q") { $options{'verbose'} = 0; } -# elsif($ARGV[$i] eq "-lang") { -# if(++$i>$#ARGV) { -# print STDERR "Option -lang requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'lang'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-l") { -# if(++$i>$#ARGV) { -# print STDERR "Option -l requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'level'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-t") { -# if(++$i>$#ARGV) { -# print STDERR "Option -t requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'time'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-vc") { -# if(++$i>$#ARGV) { -# print STDERR "Option -vc requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'vc'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-pfc") { -# if(++$i>$#ARGV) { -# print STDERR "Option -pfc requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'pfc'} = $ARGV[$i]; -# } else { -# # This must be a testcase name -# push @testcases, $ARGV[$i]; -# } -# } elsif($argState eq "stp") { -# push @stpOptions, $ARGV[$i]; -# } else { -# die "BUG: Bad argState: $argState"; -# } -# } if($#stpOptions >= 0) { $options{'stpOptions'} = join(" ", map { "\"" . $_ . "\"" } @stpOptions); @@ -534,4 +479,4 @@ if($testsProblems > 0 && $verbose) { # Delete temporary dir if there is one system("/bin/rm -rf $tmpdir"); -exit ($testsProblems > 0 ? 2 : 0); +#exit ($testsProblems > 0 ? 2 : 0); diff --git a/scripts/run_cvc_tests.pl b/scripts/run_cvc_tests.pl index e4769eb..b5dea9b 100755 --- a/scripts/run_cvc_tests.pl +++ b/scripts/run_cvc_tests.pl @@ -91,61 +91,6 @@ my @stpOptions = (); # State is either "own" or "stp", meaning that we're reading either # our own or stp's options. my $argState = "own"; -# for(my $i=0; $i <= $#ARGV; $i++) { -# if($argState eq "own") { -# if($ARGV[$i] eq "--") { $argState = "stp"; } -# elsif($ARGV[$i] eq "-h") { print($usageString, "\n"); exit 0; } -# elsif($ARGV[$i] eq "+rt") { $options{'rt'} = 1; } -# elsif($ARGV[$i] eq "-rt") { $options{'rt'} = 0; } -# elsif($ARGV[$i] eq "+proofs") { $options{'proofs'} = 1; } -# elsif($ARGV[$i] eq "-proofs") { $options{'proofs'} = 0; } -# elsif($ARGV[$i] eq "-v") { $options{'verbose'} = 1; } -# elsif($ARGV[$i] eq "-q") { $options{'verbose'} = 0; } -# elsif($ARGV[$i] eq "-lang") { -# if(++$i>$#ARGV) { -# print STDERR "Option -lang requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'lang'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-l") { -# if(++$i>$#ARGV) { -# print STDERR "Option -l requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'level'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-t") { -# if(++$i>$#ARGV) { -# print STDERR "Option -t requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'time'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-vc") { -# if(++$i>$#ARGV) { -# print STDERR "Option -vc requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'vc'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-pfc") { -# if(++$i>$#ARGV) { -# print STDERR "Option -pfc requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'pfc'} = $ARGV[$i]; -# } else { -# # This must be a testcase name -# push @testcases, $ARGV[$i]; -# } -# } elsif($argState eq "stp") { -# push @stpOptions, $ARGV[$i]; -# } else { -# die "BUG: Bad argState: $argState"; -# } -# } if($#stpOptions >= 0) { $options{'stpOptions'} = join(" ", map { "\"" . $_ . "\"" } @stpOptions); @@ -534,4 +479,5 @@ if($testsProblems > 0 && $verbose) { # Delete temporary dir if there is one system("/bin/rm -rf $tmpdir"); -exit ($testsProblems > 0 ? 2 : 0); +#exit ($testsProblems > 0 ? 2 : 0); + diff --git a/scripts/run_stp_tests.pl b/scripts/run_stp_tests.pl index 4aed013..c7d8fd5 100755 --- a/scripts/run_stp_tests.pl +++ b/scripts/run_stp_tests.pl @@ -76,7 +76,7 @@ my %optionsDefault = ("level" => 4, # when looking for info comments "maxInfoLines" => 4, # Runtime limit; 0 = no limit - "time" => 180, + "time" => 60, # Additional command line options to stp "stpOptions" => "-d"); @@ -91,61 +91,6 @@ my @stpOptions = (); # State is either "own" or "stp", meaning that we're reading either # our own or stp's options. my $argState = "own"; -# for(my $i=0; $i <= $#ARGV; $i++) { -# if($argState eq "own") { -# if($ARGV[$i] eq "--") { $argState = "stp"; } -# elsif($ARGV[$i] eq "-h") { print($usageString, "\n"); exit 0; } -# elsif($ARGV[$i] eq "+rt") { $options{'rt'} = 1; } -# elsif($ARGV[$i] eq "-rt") { $options{'rt'} = 0; } -# elsif($ARGV[$i] eq "+proofs") { $options{'proofs'} = 1; } -# elsif($ARGV[$i] eq "-proofs") { $options{'proofs'} = 0; } -# elsif($ARGV[$i] eq "-v") { $options{'verbose'} = 1; } -# elsif($ARGV[$i] eq "-q") { $options{'verbose'} = 0; } -# elsif($ARGV[$i] eq "-lang") { -# if(++$i>$#ARGV) { -# print STDERR "Option -lang requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'lang'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-l") { -# if(++$i>$#ARGV) { -# print STDERR "Option -l requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'level'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-t") { -# if(++$i>$#ARGV) { -# print STDERR "Option -t requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'time'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-vc") { -# if(++$i>$#ARGV) { -# print STDERR "Option -vc requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'vc'} = $ARGV[$i]; -# } elsif($ARGV[$i] eq "-pfc") { -# if(++$i>$#ARGV) { -# print STDERR "Option -pfc requires an argument.\n"; -# print STDERR "Run run_tests -h for help\n"; -# exit 1; -# } -# $options{'pfc'} = $ARGV[$i]; -# } else { -# # This must be a testcase name -# push @testcases, $ARGV[$i]; -# } -# } elsif($argState eq "stp") { -# push @stpOptions, $ARGV[$i]; -# } else { -# die "BUG: Bad argState: $argState"; -# } -# } if($#stpOptions >= 0) { $options{'stpOptions'} = join(" ", map { "\"" . $_ . "\"" } @stpOptions); @@ -534,4 +479,4 @@ if($testsProblems > 0 && $verbose) { # Delete temporary dir if there is one system("/bin/rm -rf $tmpdir"); -exit ($testsProblems > 0 ? 2 : 0); +#exit ($testsProblems > 0 ? 2 : 0); -- 2.47.3