ngspice version detection implemented

This commit is contained in:
dwarning
2017-08-03 17:01:49 +02:00
committed by rlar
parent eacbc3702d
commit 118026cfb9
3 changed files with 53 additions and 14 deletions
+11 -6
View File
@@ -32,7 +32,6 @@ Options:
-nw do not print warning messages
-platform prints the hardware platform and operating system version
-p plot results (limited, only standard test variant)
-P plot results (complete, for all test variants)
-r re-use previously simulated results if they exist
(default is to resimulate, even if results exist)
-sv prints the simulator version being run
@@ -70,6 +69,7 @@ undef($qaSpecFile);
undef(@Setup);
undef(@Test);
undef(@Variants);
undef(@TestVariants);
$debug=0;
$verbose=0;
$reallyVerbose=0;
@@ -98,6 +98,7 @@ undef($acClip);undef($acNdigit);undef($acRelTol);
undef($noiseClip);undef($noiseNdigit);undef($noiseRelTol);
undef($mFactor);undef($shrinkPercent);undef($scaleFactor);undef(%TestSpec);
undef($refrnceDirectory);
undef($simulatorCommand);
#
# These are the tolerances used to compare results
@@ -230,9 +231,13 @@ if (!$onlyDoComparison) {
#
if (!$onlyDoComparison) {
$version=&simulate::version();
($version,$vaVersion)=&simulate::version();
if ($onlyDoSimulatorVersion) {
print $version;exit(0);
if ($vaVersion eq "unknown") {
print $version;exit(0);
} else {
print $version,$vaVersion;exit(0);
}
}
}
$qaSpecFile=$ARGV[0];
@@ -297,7 +302,7 @@ if ($reallyVerbose) {
$flag="";
}
foreach $test (@Test) {
next if (!$doTest{$test});
next if (%doTest && !$doTest{$test});
if ($verbose) {print "\n****** Running test ($simulatorName): $test"}
@@ -305,13 +310,13 @@ foreach $test (@Test) {
undef($outputAc);
undef($outputNoise);
&modelQa::processTestSpec(@{$TestSpec{$test}});
foreach $variant (@Variants) {
foreach $variant (@TestVariants) {
if ($variant eq "standard") {
$refFile="$refrnceDirectory/$test.standard";
} else {
$refFile="$resultsDirectory/$test.standard";
}
next if (!$doVariant{$variant});
next if (%doVariant && !$doVariant{$variant});
$simFile="$resultsDirectory/$test.$variant";
if ($outputDc) {
if (($forceSimulation || ! -r $simFile) && !$onlyDoComparison) {