luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'adms-experiment-1' of ssh://git.code.sf.net/p/ngspice/ngspice into adms-experiment-1

This commit is contained in:
dwarning 2017-08-14 12:42:29 +02:00
parent b66aaaf391 ff4b8dcf41
commit 9ac3a2a97d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/bin/modelQaTestRoutines.pm
View File

@ -201,7 +201,7 @@ sub processTestSpec {
@main::ModelParameters=(); @main::ModelParameters=();
@main::TestVariants=@main::Variants; @main::TestVariants=@main::Variants;
undef(%main::BiasFor); undef(%main::BiasFor);
if (defined(%main::isGeneralFloatingPin)) { if (%main::isGeneralFloatingPin) {
%main::isFloatingPin=%main::isGeneralFloatingPin; %main::isFloatingPin=%main::isGeneralFloatingPin;
} else { } else {
undef(%main::isFloatingPin); undef(%main::isFloatingPin);

4
tests/bin/runQaTests.pl
View File

@ -329,7 +329,7 @@ if ($reallyVerbose) {
$flag=""; $flag="";
} }
foreach $test (@Test) { foreach $test (@Test) {
next if (defined(%doTest) && !$doTest{$test}); next if (%doTest && !$doTest{$test});
if ($verbose) {print "\n****** Running test ($simulatorName): $test"} if ($verbose) {print "\n****** Running test ($simulatorName): $test"}
@ -343,7 +343,7 @@ foreach $test (@Test) {
} else { } else {
$refFile="$resultsDirectory/$test.standard"; $refFile="$resultsDirectory/$test.standard";
} }
next if (defined(%doVariant) && !$doVariant{$variant}); next if (%doVariant && !$doVariant{$variant});
$simFile="$resultsDirectory/$test.$variant"; $simFile="$resultsDirectory/$test.$variant";
if ($outputDc) { if ($outputDc) {
if (($forceSimulation || ! -r $simFile) && !$onlyDoComparison) { if (($forceSimulation || ! -r $simFile) && !$onlyDoComparison) {