git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk...

diff --git a/make-scripts/Makefile.common b/scripts/Makefile.common
similarity index 100%
rename from make-scripts/Makefile.common
rename to scripts/Makefile.common

diff --git a/make-scripts/Makefile.in b/scripts/Makefile.in
similarity index 100%
rename from make-scripts/Makefile.in
rename to scripts/Makefile.in

diff --git a/make-scripts/config.info b/scripts/config.info
similarity index 100%
rename from make-scripts/config.info
rename to scripts/config.info

diff --git a/make-scripts/configure b/scripts/configure
similarity index 100%
rename from make-scripts/configure
rename to scripts/configure

diff --git a/make-scripts/format_config.xml b/scripts/format_config.xml
similarity index 100%
rename from make-scripts/format_config.xml
rename to scripts/format_config.xml

diff --git a/make-scripts/liblinks.sh b/scripts/liblinks.sh
similarity index 100%
rename from make-scripts/liblinks.sh
rename to scripts/liblinks.sh

diff --git a/bin/run_bigarray_tests b/scripts/run_bigarray_tests.pl
similarity index 100%
rename from bin/run_bigarray_tests
rename to scripts/run_bigarray_tests.pl

diff --git a/bin/run_tests b/scripts/run_cvc_tests.pl
similarity index 100%
rename from bin/run_tests
rename to scripts/run_cvc_tests.pl

diff --git a/bin/run_smt_tests b/scripts/run_smt_tests.pl
similarity index 87%
rename from bin/run_smt_tests
rename to scripts/run_smt_tests.pl
index 6ffadd10d803c22a365456ac064eac7ea89f551c..7eaacadb6b49cc2c2b5e892ef89cddff5ce1046f 100755 (executable)
--- a/bin/run_smt_tests
+++ b/scripts/run_smt_tests.pl
@@ -84,71 +84,6 @@ my %optionsDefault = ("level" => 4,
                      # Additional command line options to stp
                      "stpOptions" => "-d -f");
 
-# Database of command line options.  Initially, they are undefined
-my %options = ();
-# The list of testcases to run
-my @testcases = "../../stp-tests/smt-test";
-# Temporary array for STP options
-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);
 }
@@ -299,7 +234,7 @@ my $totalTime = time;
 my $defaultDir = `pwd`;
 $defaultDir =~ s/\n//;
 
-foreach my $testcase (@testcases) {
+foreach my $testcase ((@testcases,@testcases1)) {
     chdir $defaultDir or die "Cannot chdir to $defaultDir: $?";
     my @testcasesTmp = ();
     if(-f $testcase) { push @testcasesTmp, $testcase; }