From d09ad841ac9e452eb3580005d90ea20b23a74c35 Mon Sep 17 00:00:00 2001 From: dwarning Date: Mon, 30 Mar 2015 11:48:29 +0200 Subject: [PATCH] few unifications for better qa tests and recover permission of run scripts --- tests/bsim3/nmos/qaSpec | 5 +++++ tests/bsim3/nmos/run | 0 tests/bsim3/pmos/qaSpec | 9 +++++++-- tests/bsim3/pmos/run | 0 tests/bsim4/nmos/qaSpec | 12 ++++++++---- tests/bsim4/nmos/run | 0 tests/bsim4/pmos/qaSpec | 12 ++++++++---- tests/bsim4/pmos/run | 0 tests/bsimsoi/nmos/qaSpec | 12 ++++++++++-- tests/bsimsoi/nmos/run | 3 +++ tests/bsimsoi/pmos/qaSpec | 12 ++++++++++-- tests/bsimsoi/pmos/run | 3 +++ tests/hisim/nmos/qaSpec | 6 ++++++ tests/hisim/nmos/run | 0 tests/hisim/pmos/qaSpec | 6 ++++++ tests/hisim/pmos/run | 0 tests/hisimhv1/nmos/qaSpec | 17 ++++++++--------- tests/hisimhv1/nmos/run | 0 tests/hisimhv1/pmos/qaSpec | 11 +++++------ tests/hisimhv1/pmos/run | 0 20 files changed, 79 insertions(+), 29 deletions(-) mode change 100644 => 100755 tests/bsim3/nmos/run mode change 100644 => 100755 tests/bsim3/pmos/run mode change 100644 => 100755 tests/bsim4/nmos/run mode change 100644 => 100755 tests/bsim4/pmos/run create mode 100755 tests/bsimsoi/nmos/run create mode 100755 tests/bsimsoi/pmos/run mode change 100644 => 100755 tests/hisim/nmos/run mode change 100644 => 100755 tests/hisim/pmos/run mode change 100644 => 100755 tests/hisimhv1/nmos/run mode change 100644 => 100755 tests/hisimhv1/pmos/run diff --git a/tests/bsim3/nmos/qaSpec b/tests/bsim3/nmos/qaSpec index 2bc82da35..f08844051 100644 --- a/tests/bsim3/nmos/qaSpec +++ b/tests/bsim3/nmos/qaSpec @@ -1,3 +1,4 @@ + // // Test specification for bsim3 (version 3.3.0) // @@ -21,6 +22,10 @@ pTypeSelectionArguments pmos level=7 version=3.2.4 nTypeSelectionArguments nmos level=8 version=3.3.0 pTypeSelectionArguments pmos level=8 version=3.3.0 `endif +`ifdef hspice +nTypeSelectionArguments nmos level=53 version=3.3.0 +pTypeSelectionArguments pmos level=53 version=3.3.0 +`endif // // General test-independent information diff --git a/tests/bsim3/nmos/run b/tests/bsim3/nmos/run old mode 100644 new mode 100755 diff --git a/tests/bsim3/pmos/qaSpec b/tests/bsim3/pmos/qaSpec index 6dfb37476..0627140a6 100644 --- a/tests/bsim3/pmos/qaSpec +++ b/tests/bsim3/pmos/qaSpec @@ -1,3 +1,4 @@ + // // Test specification for bsim3 (version 3.3.0) // @@ -15,11 +16,15 @@ `ifdef spice nTypeSelectionArguments pmos level=7 version=3.2.4 -pTypeSelectionArguments pmos level=7 version=3.2.4 +pTypeSelectionArguments nmos level=7 version=3.2.4 `endif `ifdef ngspice nTypeSelectionArguments pmos level=8 version=3.3.0 -pTypeSelectionArguments pmos level=8 version=3.3.0 +pTypeSelectionArguments nmos level=8 version=3.3.0 +`endif +`ifdef hspice +nTypeSelectionArguments pmos level=53 version=3.3.0 +pTypeSelectionArguments nmos level=53 version=3.3.0 `endif // diff --git a/tests/bsim3/pmos/run b/tests/bsim3/pmos/run old mode 100644 new mode 100755 diff --git a/tests/bsim4/nmos/qaSpec b/tests/bsim4/nmos/qaSpec index 88ac522da..208398d20 100644 --- a/tests/bsim4/nmos/qaSpec +++ b/tests/bsim4/nmos/qaSpec @@ -15,12 +15,16 @@ // `ifdef spice -nTypeSelectionArguments nmos level=14 version=4.7.0 -pTypeSelectionArguments pmos level=14 version=4.7.0 +nTypeSelectionArguments nmos level=14 version=4.8.0 +pTypeSelectionArguments pmos level=14 version=4.8.0 `endif `ifdef ngspice -nTypeSelectionArguments nmos level=14 version=4.8.0 -pTypeSelectionArguments pmos level=14 version=4.8.0 +nTypeSelectionArguments nmos level=14 version=4.8.0 +pTypeSelectionArguments pmos level=14 version=4.8.0 +`endif +`ifdef hspice +nTypeSelectionArguments nmos level=54 version=4.5 +pTypeSelectionArguments pmos level=54 version=4.5 `endif // diff --git a/tests/bsim4/nmos/run b/tests/bsim4/nmos/run old mode 100644 new mode 100755 diff --git a/tests/bsim4/pmos/qaSpec b/tests/bsim4/pmos/qaSpec index 4c5a4bc7e..864c1c560 100644 --- a/tests/bsim4/pmos/qaSpec +++ b/tests/bsim4/pmos/qaSpec @@ -15,12 +15,16 @@ // `ifdef spice -nTypeSelectionArguments pmos level=14 version=4.7.0 -pTypeSelectionArguments pmos level=14 version=4.7.0 +nTypeSelectionArguments pmos level=14 version=4.8.0 +pTypeSelectionArguments nmos level=14 version=4.8.0 `endif `ifdef ngspice -nTypeSelectionArguments pmos level=14 version=4.8.0 -pTypeSelectionArguments pmos level=14 version=4.8.0 +nTypeSelectionArguments pmos level=14 version=4.8.0 +pTypeSelectionArguments nmos level=14 version=4.8.0 +`endif +`ifdef hspice +nTypeSelectionArguments pmos level=54 version=4.5 +pTypeSelectionArguments nmos level=54 version=4.5 `endif // diff --git a/tests/bsim4/pmos/run b/tests/bsim4/pmos/run old mode 100644 new mode 100755 diff --git a/tests/bsimsoi/nmos/qaSpec b/tests/bsimsoi/nmos/qaSpec index 8984fcbee..fbfb7aea2 100644 --- a/tests/bsimsoi/nmos/qaSpec +++ b/tests/bsimsoi/nmos/qaSpec @@ -14,9 +14,17 @@ // parameters. // +`ifdef spice +nTypeSelectionArguments nmos level=10 +pTypeSelectionArguments pmos level=10 +`endif `ifdef ngspice -nTypeSelectionArguments nmos level=10 -pTypeSelectionArguments pmos level=10 +nTypeSelectionArguments nmos level=10 +pTypeSelectionArguments pmos level=10 +`endif +`ifdef hspice +nTypeSelectionArguments nmos level=70 version=4.4 +pTypeSelectionArguments pmos level=70 version=4.4 `endif // diff --git a/tests/bsimsoi/nmos/run b/tests/bsimsoi/nmos/run new file mode 100755 index 000000000..b663012c2 --- /dev/null +++ b/tests/bsimsoi/nmos/run @@ -0,0 +1,3 @@ +#!/bin/sh + +../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log diff --git a/tests/bsimsoi/pmos/qaSpec b/tests/bsimsoi/pmos/qaSpec index 17eaef9c9..efcc3bc35 100644 --- a/tests/bsimsoi/pmos/qaSpec +++ b/tests/bsimsoi/pmos/qaSpec @@ -14,9 +14,17 @@ // parameters. // +`ifdef spice +nTypeSelectionArguments pmos level=10 +pTypeSelectionArguments nmos level=10 +`endif `ifdef ngspice -nTypeSelectionArguments pmos level=10 -pTypeSelectionArguments pmos level=10 +nTypeSelectionArguments pmos level=10 +pTypeSelectionArguments nmos level=10 +`endif +`ifdef hspice +nTypeSelectionArguments pmos level=70 version=4.4 +pTypeSelectionArguments nmos level=70 version=4.4 `endif // diff --git a/tests/bsimsoi/pmos/run b/tests/bsimsoi/pmos/run new file mode 100755 index 000000000..0883628de --- /dev/null +++ b/tests/bsimsoi/pmos/run @@ -0,0 +1,3 @@ +#!/bin/sh + +../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log diff --git a/tests/hisim/nmos/qaSpec b/tests/hisim/nmos/qaSpec index 13bdf5df6..f7b81aa76 100644 --- a/tests/hisim/nmos/qaSpec +++ b/tests/hisim/nmos/qaSpec @@ -11,6 +11,7 @@ // names or levels for the same model) and to switch // between nType and pType polarities. // It is assumed that there are no polarity specific +// parameters. // `ifdef spice @@ -21,6 +22,10 @@ pTypeSelectionArguments pmos level=61 version=270 nTypeSelectionArguments nmos level=68 version=270 pTypeSelectionArguments pmos level=68 version=270 `endif +`ifdef hspice +nTypeSelectionArguments nmos level=68 version=2.7.0 +pTypeSelectionArguments pmos level=68 version=2.7.0 +`endif // // General test-independent information @@ -31,6 +36,7 @@ pins d g s b linearScale w l ps pd areaScale as ad temperature 27 -50 150 +symmetricPins d s scaleParameters m diff --git a/tests/hisim/nmos/run b/tests/hisim/nmos/run old mode 100644 new mode 100755 diff --git a/tests/hisim/pmos/qaSpec b/tests/hisim/pmos/qaSpec index 193c50b41..ea24bfcaf 100644 --- a/tests/hisim/pmos/qaSpec +++ b/tests/hisim/pmos/qaSpec @@ -11,6 +11,7 @@ // names or levels for the same model) and to switch // between nType and pType polarities. // It is assumed that there are no polarity specific +// parameters. // `ifdef spice @@ -21,6 +22,10 @@ pTypeSelectionArguments nmos level=61 version=270 nTypeSelectionArguments pmos level=68 version=270 pTypeSelectionArguments nmos level=68 version=270 `endif +`ifdef hspice +nTypeSelectionArguments pmos level=68 version=2.7.0 +pTypeSelectionArguments nmos level=68 version=2.7.0 +`endif // // General test-independent information @@ -31,6 +36,7 @@ pins d g s b linearScale w l ps pd areaScale as ad temperature 27 -50 150 +symmetricPins d s scaleParameters m diff --git a/tests/hisim/pmos/run b/tests/hisim/pmos/run old mode 100644 new mode 100755 diff --git a/tests/hisimhv1/nmos/qaSpec b/tests/hisimhv1/nmos/qaSpec index e12e55f8a..3dfd93c25 100644 --- a/tests/hisimhv1/nmos/qaSpec +++ b/tests/hisimhv1/nmos/qaSpec @@ -14,17 +14,17 @@ // parameters. // -`ifdef ngspice -nTypeSelectionArguments nmos level=73 version=1.24 -pTypeSelectionArguments pmos level=73 version=1.24 -`endif `ifdef spice -nTypeSelectionArguments nmos level=62 version=1.24 -pTypeSelectionArguments pmos level=62 version=1.24 +nTypeSelectionArguments nmos level=62 version=1.24 +pTypeSelectionArguments pmos level=62 version=1.24 +`endif +`ifdef ngspice +nTypeSelectionArguments nmos level=73 version=1.24 +pTypeSelectionArguments pmos level=73 version=1.24 `endif `ifdef hspice -nTypeSelectionArguments nmos level=73 version=1.24 -pTypeSelectionArguments pmos level=73 version=1.24 +nTypeSelectionArguments nmos level=73 version=1.2.4 +pTypeSelectionArguments pmos level=73 version=1.2.4 `endif // @@ -37,7 +37,6 @@ linearScale w l ps pd areaScale as ad temperature 27 -50 150 //checkPolarity yes -//symmetricpins d s scaleParameters m // diff --git a/tests/hisimhv1/nmos/run b/tests/hisimhv1/nmos/run old mode 100644 new mode 100755 diff --git a/tests/hisimhv1/pmos/qaSpec b/tests/hisimhv1/pmos/qaSpec index 5b0bb1cca..61b1aaad4 100644 --- a/tests/hisimhv1/pmos/qaSpec +++ b/tests/hisimhv1/pmos/qaSpec @@ -14,18 +14,18 @@ // parameters. // -`ifdef ngspice -nTypeSelectionArguments pmos level=73 version=1.24 -pTypeSelectionArguments nmos level=73 version=1.24 -`endif `ifdef spice nTypeSelectionArguments pmos level=62 version=1.24 pTypeSelectionArguments nmos level=62 version=1.24 `endif -`ifdef hspice +`ifdef ngspice nTypeSelectionArguments pmos level=73 version=1.24 pTypeSelectionArguments nmos level=73 version=1.24 `endif +`ifdef hspice +nTypeSelectionArguments pmos level=73 version=1.2.4 +pTypeSelectionArguments nmos level=73 version=1.2.4 +`endif // // General test-independent information @@ -37,7 +37,6 @@ linearScale w l ps pd areaScale as ad temperature 27 -50 150 //checkPolarity yes -//symmetricpins d s scaleParameters m // diff --git a/tests/hisimhv1/pmos/run b/tests/hisimhv1/pmos/run old mode 100644 new mode 100755