From 12b3cc52ec2f96465e80a6172dde0f7ade5b92f5 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 31 May 2011 20:09:34 +0000
Subject: [PATCH] CMC test suite, fix choice of results subdirectory

---
 ChangeLog                 | 8 ++++++++
 tests/bin/check_cmc.sh    | 5 +++++
 tests/bin/runQaTests.pl   | 4 +++-
 tests/bin/run_cmc_check   | 6 ++++++
 tests/hisim/Makefile.am   | 2 +-
 tests/hisimhv/Makefile.am | 2 +-
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c8dd6ea0..1c8493261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-31  Robert Larice
+ * tests/bin/check_cmc.sh ,
+ * tests/bin/runQaTests.pl ,
+ * tests/bin/run_cmc_check ,
+ * tests/hisim/Makefile.am ,
+ * tests/hisimhv/Makefile.am :
+   CMC test suite, fix choice of results subdirectory
+
 2011-05-31  Robert Larice
  * tests/bsim3soifd/RampVg2.out ,
  * tests/bsim3soifd/inv2.out ,
diff --git a/tests/bin/check_cmc.sh b/tests/bin/check_cmc.sh
index babd2f0cd..f8ee587b4 100755
--- a/tests/bin/check_cmc.sh
+++ b/tests/bin/check_cmc.sh
@@ -10,13 +10,18 @@
 executable="$1"
 qaspec="$2"
 subdir="$(dirname $2)"
+kind="$(basename $subdir)"
 
 echo "qaspec = $qaspec"
 echo "subdir = $subdir"
 echo "executable = $executable"
+echo "kind = $kind"
+
+mkdir -p "$kind"
 
 exec "$(dirname $0)/run_cmc_check" \
     --executable="${executable}" \
     --srcdir="${subdir}/" \
+    --results "$kind/results" \
     -qa "${qaspec}" \
     ngspice
diff --git a/tests/bin/runQaTests.pl b/tests/bin/runQaTests.pl
index e2196a965..b303cfcbd 100755
--- a/tests/bin/runQaTests.pl
+++ b/tests/bin/runQaTests.pl
@@ -85,6 +85,7 @@ $printWarnings=1;
 $programDirectory=join("/",@prog[0..$#prog-1]);
 $prog=$prog[$#prog];
 $srcdir="";
+$resultsDirectory="results";
 
 #
 #   These variables are only defined once in this file,
@@ -161,6 +162,8 @@ for (;;) {
         $forceSimulation=0;
     } elsif ($ARGV[0]  =~ /^-sv/i) {
         $onlyDoSimulatorVersion=1;
+    } elsif ($ARGV[0]  =~ /^--results=(.*)/i) {
+        $resultsDirectory=$1;
     } elsif ($ARGV[0]  =~ /^--executable=(.*)/i) {
         $simulatorCommand=$1;
     } elsif ($ARGV[0]  =~ /^-s/) {
@@ -233,7 +236,6 @@ if (!$onlyDoComparison) {
     }
 }
 $qaSpecFile=$ARGV[0];
-$resultsDirectory="results";
 $refrnceDirectory=$main::srcdir . "reference";
 
 undef(%Defined);
diff --git a/tests/bin/run_cmc_check b/tests/bin/run_cmc_check
index 0b28149c8..55a36acc5 100755
--- a/tests/bin/run_cmc_check
+++ b/tests/bin/run_cmc_check
@@ -61,6 +61,7 @@ run_test() {
                 -s ${simname} \
                 -r -t ${test} \
                 -var ${variant} \
+                --results=${qaResultsDirectory} \
                 ${qaSpecFile}
 	done
     done
@@ -90,6 +91,7 @@ run_test() {
                         -s ${simname} \
                         -t ${test} \
                         -var ${variant} \
+                        --results=${qaResultsDirectory} \
                         ${qaSpecFile}
 		done
 	    done
@@ -135,6 +137,10 @@ while test $# -gt 0; do
           testProgramFlags="$testProgramFlags $1"
           shift
           ;;
+      --results)
+          qaResultsDirectory="$2"
+          shift ; shift
+          ;;
       -qa)
           qaSpecFile="$2"
           shift ; shift
diff --git a/tests/hisim/Makefile.am b/tests/hisim/Makefile.am
index 08f79eaee..44ddb3258 100644
--- a/tests/hisim/Makefile.am
+++ b/tests/hisim/Makefile.am
@@ -16,4 +16,4 @@ EXTRA_DIST = \
 MAINTAINERCLEANFILES = Makefile.in
 
 clean-local:
-	rm -rf results ngspiceCkt
+	rm -rf nmos/results pmos/results ngspiceCkt
diff --git a/tests/hisimhv/Makefile.am b/tests/hisimhv/Makefile.am
index 742c6b7fe..89d805a88 100644
--- a/tests/hisimhv/Makefile.am
+++ b/tests/hisimhv/Makefile.am
@@ -14,4 +14,4 @@ EXTRA_DIST = \
 MAINTAINERCLEANFILES = Makefile.in
 
 clean-local:
-	rm -rf results ngspiceCkt
+	rm -rf nmos/results pmos/results ngspiceCkt