[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-186-gfde0b77)
The branch, master has been updated
via fde0b77b96ef92d5e220dafeb31c92c03f7df0bf (commit)
via b0613e375ab887d4a5ed5c3022a12c485cad1ab2 (commit)
from 34d46a6158050b232f29e61d0cae8ac1aacca2a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
.../tests/common/outputs/bom/JD_Include-output.net | 12 ----------
.../tests/common/outputs/bom/JD_Include.retcode | 2 +-
.../outputs/bom/JD_Include_nomunge-output.net | 12 ----------
.../common/outputs/bom/JD_Include_nomunge.retcode | 2 +-
.../tests/common/outputs/bom/JD_Sort-output.net | 12 ----------
gnetlist/tests/common/outputs/bom/JD_Sort.retcode | 2 +-
.../common/outputs/bom/JD_Sort_nomunge-output.net | 12 ----------
.../common/outputs/bom/JD_Sort_nomunge.retcode | 2 +-
.../tests/common/outputs/bom/JD_nomunge-output.net | 12 ----------
.../tests/common/outputs/bom/JD_nomunge.retcode | 2 +-
.../outputs/bom/TwoStageAmp_Include-output.net | 24 --------------------
.../common/outputs/bom/TwoStageAmp_Include.retcode | 2 +-
.../common/outputs/bom/TwoStageAmp_Sort-output.net | 24 --------------------
.../common/outputs/bom/TwoStageAmp_Sort.retcode | 2 +-
.../common/outputs/bom2/JD_Include-output.net | 12 ----------
.../tests/common/outputs/bom2/JD_Include.retcode | 2 +-
.../outputs/bom2/JD_Include_nomunge-output.net | 12 ----------
.../common/outputs/bom2/JD_Include_nomunge.retcode | 2 +-
.../tests/common/outputs/bom2/JD_Sort-output.net | 12 ----------
gnetlist/tests/common/outputs/bom2/JD_Sort.retcode | 2 +-
.../common/outputs/bom2/JD_Sort_nomunge-output.net | 12 ----------
.../common/outputs/bom2/JD_Sort_nomunge.retcode | 2 +-
.../common/outputs/bom2/JD_nomunge-output.net | 12 ----------
.../tests/common/outputs/bom2/JD_nomunge.retcode | 2 +-
.../outputs/bom2/TwoStageAmp_Include-output.net | 24 --------------------
.../outputs/bom2/TwoStageAmp_Include.retcode | 2 +-
.../outputs/bom2/TwoStageAmp_Sort-output.net | 24 --------------------
.../common/outputs/bom2/TwoStageAmp_Sort.retcode | 2 +-
gnetlist/tests/common/run_backend_tests.sh | 14 ++++++++++-
29 files changed, 27 insertions(+), 231 deletions(-)
delete mode 100644 gnetlist/tests/common/outputs/bom/JD_Include-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom/JD_Include_nomunge-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom/JD_Sort-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom/JD_Sort_nomunge-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom/JD_nomunge-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom/TwoStageAmp_Include-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/JD_Include-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
delete mode 100644 gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
=================
Commit Messages
=================
commit fde0b77b96ef92d5e220dafeb31c92c03f7df0bf
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Regenerate `bom' and `bom2' test results.
In commit 76bc345ee043, the `bom' and `bom2' backends were modified to
be more informative about attribute list specifications. As a
side-effect of this work, the backend options for these backends are
now much more strictly validated. Tests which pass `-O include_mode'
or `-O sort_mode' to gnetlist therefore now fail for the BOM backends,
and this patch updates the golden files appropriately.
Affects-bug: lp-810202
Reported-by: Dan McMahill <dan@xxxxxxxxxxxx>
:100644 000000 f6a6bef... 0000000... D gnetlist/tests/common/outputs/bom/JD_Include-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/JD_Include.retcode
:100644 000000 f6a6bef... 0000000... D gnetlist/tests/common/outputs/bom/JD_Include_nomunge-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/JD_Include_nomunge.retcode
:100644 000000 f6a6bef... 0000000... D gnetlist/tests/common/outputs/bom/JD_Sort-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/JD_Sort.retcode
:100644 000000 f6a6bef... 0000000... D gnetlist/tests/common/outputs/bom/JD_Sort_nomunge-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/JD_Sort_nomunge.retcode
:100644 000000 f6a6bef... 0000000... D gnetlist/tests/common/outputs/bom/JD_nomunge-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
:100644 000000 6884764... 0000000... D gnetlist/tests/common/outputs/bom/TwoStageAmp_Include-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/TwoStageAmp_Include.retcode
:100644 000000 6884764... 0000000... D gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort.retcode
:100644 000000 5c04b06... 0000000... D gnetlist/tests/common/outputs/bom2/JD_Include-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/JD_Include.retcode
:100644 000000 5c04b06... 0000000... D gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/JD_Include_nomunge.retcode
:100644 000000 5c04b06... 0000000... D gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/JD_Sort.retcode
:100644 000000 5c04b06... 0000000... D gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge.retcode
:100644 000000 5c04b06... 0000000... D gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
:100644 000000 8112a83... 0000000... D gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include.retcode
:100644 000000 8112a83... 0000000... D gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
:100644 100644 573541a... d00491f... M gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort.retcode
commit b0613e375ab887d4a5ed5c3022a12c485cad1ab2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Make common tests cope with no output.
Some gnetlist backends may fail, expectedly, without generating
output. Update common gnetlist test harness to cope with this.
:100755 100755 1882634... 54caa88... M gnetlist/tests/common/run_backend_tests.sh
=========
Changes
=========
commit fde0b77b96ef92d5e220dafeb31c92c03f7df0bf
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Regenerate `bom' and `bom2' test results.
In commit 76bc345ee043, the `bom' and `bom2' backends were modified to
be more informative about attribute list specifications. As a
side-effect of this work, the backend options for these backends are
now much more strictly validated. Tests which pass `-O include_mode'
or `-O sort_mode' to gnetlist therefore now fail for the BOM backends,
and this patch updates the golden files appropriately.
Affects-bug: lp-810202
Reported-by: Dan McMahill <dan@xxxxxxxxxxxx>
diff --git a/gnetlist/tests/common/outputs/bom/JD_Include-output.net b/gnetlist/tests/common/outputs/bom/JD_Include-output.net
deleted file mode 100644
index f6a6bef..0000000
--- a/gnetlist/tests/common/outputs/bom/JD_Include-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes refdes value device
-A1 A1 unknown model
-Cm Cm 20p CAPACITOR
-Cp Cp 20p CAPACITOR
-Rlp Rlp 1meg RESISTOR
-Rlm Rlm 500k RESISTOR
-Vdd Vdd DC 3.3V VOLTAGE_SOURCE
-V1 V1 pulse 3.3 0 1u 10p 10p 1.25u 2.5u vpulse
-Rt Rt 1k RESISTOR
-Rb Rb 5.6k RESISTOR
-M1 M1 unknown PMOS_TRANSISTOR
-X1 X1 unknown LVD
diff --git a/gnetlist/tests/common/outputs/bom/JD_Include.retcode b/gnetlist/tests/common/outputs/bom/JD_Include.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/JD_Include.retcode
+++ b/gnetlist/tests/common/outputs/bom/JD_Include.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom/JD_Include_nomunge-output.net b/gnetlist/tests/common/outputs/bom/JD_Include_nomunge-output.net
deleted file mode 100644
index f6a6bef..0000000
--- a/gnetlist/tests/common/outputs/bom/JD_Include_nomunge-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes refdes value device
-A1 A1 unknown model
-Cm Cm 20p CAPACITOR
-Cp Cp 20p CAPACITOR
-Rlp Rlp 1meg RESISTOR
-Rlm Rlm 500k RESISTOR
-Vdd Vdd DC 3.3V VOLTAGE_SOURCE
-V1 V1 pulse 3.3 0 1u 10p 10p 1.25u 2.5u vpulse
-Rt Rt 1k RESISTOR
-Rb Rb 5.6k RESISTOR
-M1 M1 unknown PMOS_TRANSISTOR
-X1 X1 unknown LVD
diff --git a/gnetlist/tests/common/outputs/bom/JD_Include_nomunge.retcode b/gnetlist/tests/common/outputs/bom/JD_Include_nomunge.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/JD_Include_nomunge.retcode
+++ b/gnetlist/tests/common/outputs/bom/JD_Include_nomunge.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom/JD_Sort-output.net b/gnetlist/tests/common/outputs/bom/JD_Sort-output.net
deleted file mode 100644
index f6a6bef..0000000
--- a/gnetlist/tests/common/outputs/bom/JD_Sort-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes refdes value device
-A1 A1 unknown model
-Cm Cm 20p CAPACITOR
-Cp Cp 20p CAPACITOR
-Rlp Rlp 1meg RESISTOR
-Rlm Rlm 500k RESISTOR
-Vdd Vdd DC 3.3V VOLTAGE_SOURCE
-V1 V1 pulse 3.3 0 1u 10p 10p 1.25u 2.5u vpulse
-Rt Rt 1k RESISTOR
-Rb Rb 5.6k RESISTOR
-M1 M1 unknown PMOS_TRANSISTOR
-X1 X1 unknown LVD
diff --git a/gnetlist/tests/common/outputs/bom/JD_Sort.retcode b/gnetlist/tests/common/outputs/bom/JD_Sort.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/JD_Sort.retcode
+++ b/gnetlist/tests/common/outputs/bom/JD_Sort.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge-output.net b/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge-output.net
deleted file mode 100644
index f6a6bef..0000000
--- a/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes refdes value device
-A1 A1 unknown model
-Cm Cm 20p CAPACITOR
-Cp Cp 20p CAPACITOR
-Rlp Rlp 1meg RESISTOR
-Rlm Rlm 500k RESISTOR
-Vdd Vdd DC 3.3V VOLTAGE_SOURCE
-V1 V1 pulse 3.3 0 1u 10p 10p 1.25u 2.5u vpulse
-Rt Rt 1k RESISTOR
-Rb Rb 5.6k RESISTOR
-M1 M1 unknown PMOS_TRANSISTOR
-X1 X1 unknown LVD
diff --git a/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge.retcode b/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge.retcode
+++ b/gnetlist/tests/common/outputs/bom/JD_Sort_nomunge.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom/JD_nomunge-output.net b/gnetlist/tests/common/outputs/bom/JD_nomunge-output.net
deleted file mode 100644
index f6a6bef..0000000
--- a/gnetlist/tests/common/outputs/bom/JD_nomunge-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes refdes value device
-A1 A1 unknown model
-Cm Cm 20p CAPACITOR
-Cp Cp 20p CAPACITOR
-Rlp Rlp 1meg RESISTOR
-Rlm Rlm 500k RESISTOR
-Vdd Vdd DC 3.3V VOLTAGE_SOURCE
-V1 V1 pulse 3.3 0 1u 10p 10p 1.25u 2.5u vpulse
-Rt Rt 1k RESISTOR
-Rb Rb 5.6k RESISTOR
-M1 M1 unknown PMOS_TRANSISTOR
-X1 X1 unknown LVD
diff --git a/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode b/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
+++ b/gnetlist/tests/common/outputs/bom/JD_nomunge.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include-output.net b/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include-output.net
deleted file mode 100644
index 6884764..0000000
--- a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include-output.net
+++ /dev/null
@@ -1,24 +0,0 @@
-refdes refdes value device
-C2 C2 2.2uF CAPACITOR
-R4 R4 2.8K RESISTOR
-R3 R3 28K RESISTOR
-R8 R8 1 RESISTOR
-CE2 CE2 1pF CAPACITOR
-RE2 RE2 100 RESISTOR
-RC1 RC1 3.3K RESISTOR
-Q2 Q2 unknown NPN_TRANSISTOR
-C1 C1 2.2uF CAPACITOR
-A3 A3 .options TEMP=25 directive
-A2 A2 unknown include
-A1 A1 unknown model
-VCC VCC DC 15V VOLTAGE_SOURCE
-Vinput Vinput DC 1.6V AC 10MV SIN(0 1MV 1KHZ) vsin
-CE1 CE1 1pF CAPACITOR
-Cout Cout 2.2uF CAPACITOR
-RL RL 100K RESISTOR
-RC2 RC2 1K RESISTOR
-RE1 RE1 100 RESISTOR
-R2 R2 2K RESISTOR
-R1 R1 28K RESISTOR
-R5 R5 10 RESISTOR
-Q1 Q1 unknown NPN_TRANSISTOR
diff --git a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include.retcode b/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include.retcode
+++ b/gnetlist/tests/common/outputs/bom/TwoStageAmp_Include.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort-output.net b/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort-output.net
deleted file mode 100644
index 6884764..0000000
--- a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort-output.net
+++ /dev/null
@@ -1,24 +0,0 @@
-refdes refdes value device
-C2 C2 2.2uF CAPACITOR
-R4 R4 2.8K RESISTOR
-R3 R3 28K RESISTOR
-R8 R8 1 RESISTOR
-CE2 CE2 1pF CAPACITOR
-RE2 RE2 100 RESISTOR
-RC1 RC1 3.3K RESISTOR
-Q2 Q2 unknown NPN_TRANSISTOR
-C1 C1 2.2uF CAPACITOR
-A3 A3 .options TEMP=25 directive
-A2 A2 unknown include
-A1 A1 unknown model
-VCC VCC DC 15V VOLTAGE_SOURCE
-Vinput Vinput DC 1.6V AC 10MV SIN(0 1MV 1KHZ) vsin
-CE1 CE1 1pF CAPACITOR
-Cout Cout 2.2uF CAPACITOR
-RL RL 100K RESISTOR
-RC2 RC2 1K RESISTOR
-RE1 RE1 100 RESISTOR
-R2 R2 2K RESISTOR
-R1 R1 28K RESISTOR
-R5 R5 10 RESISTOR
-Q1 Q1 unknown NPN_TRANSISTOR
diff --git a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort.retcode b/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort.retcode
+++ b/gnetlist/tests/common/outputs/bom/TwoStageAmp_Sort.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Include-output.net b/gnetlist/tests/common/outputs/bom2/JD_Include-output.net
deleted file mode 100644
index 5c04b06..0000000
--- a/gnetlist/tests/common/outputs/bom2/JD_Include-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes:refdes:value:device:qty
-X1:X1:unknown:LVD:1
-M1:M1:unknown:PMOS_TRANSISTOR:1
-Rb:Rb:5.6k:RESISTOR:1
-Rt:Rt:1k:RESISTOR:1
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
-Rlm:Rlm:500k:RESISTOR:1
-Rlp:Rlp:1meg:RESISTOR:1
-Cp:Cp:20p:CAPACITOR:1
-Cm:Cm:20p:CAPACITOR:1
-A1:A1:unknown:model:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Include.retcode b/gnetlist/tests/common/outputs/bom2/JD_Include.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Include.retcode
+++ b/gnetlist/tests/common/outputs/bom2/JD_Include.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net b/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
deleted file mode 100644
index 5c04b06..0000000
--- a/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes:refdes:value:device:qty
-X1:X1:unknown:LVD:1
-M1:M1:unknown:PMOS_TRANSISTOR:1
-Rb:Rb:5.6k:RESISTOR:1
-Rt:Rt:1k:RESISTOR:1
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
-Rlm:Rlm:500k:RESISTOR:1
-Rlp:Rlp:1meg:RESISTOR:1
-Cp:Cp:20p:CAPACITOR:1
-Cm:Cm:20p:CAPACITOR:1
-A1:A1:unknown:model:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge.retcode b/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge.retcode
+++ b/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net b/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
deleted file mode 100644
index 5c04b06..0000000
--- a/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes:refdes:value:device:qty
-X1:X1:unknown:LVD:1
-M1:M1:unknown:PMOS_TRANSISTOR:1
-Rb:Rb:5.6k:RESISTOR:1
-Rt:Rt:1k:RESISTOR:1
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
-Rlm:Rlm:500k:RESISTOR:1
-Rlp:Rlp:1meg:RESISTOR:1
-Cp:Cp:20p:CAPACITOR:1
-Cm:Cm:20p:CAPACITOR:1
-A1:A1:unknown:model:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Sort.retcode b/gnetlist/tests/common/outputs/bom2/JD_Sort.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Sort.retcode
+++ b/gnetlist/tests/common/outputs/bom2/JD_Sort.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net b/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
deleted file mode 100644
index 5c04b06..0000000
--- a/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes:refdes:value:device:qty
-X1:X1:unknown:LVD:1
-M1:M1:unknown:PMOS_TRANSISTOR:1
-Rb:Rb:5.6k:RESISTOR:1
-Rt:Rt:1k:RESISTOR:1
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
-Rlm:Rlm:500k:RESISTOR:1
-Rlp:Rlp:1meg:RESISTOR:1
-Cp:Cp:20p:CAPACITOR:1
-Cm:Cm:20p:CAPACITOR:1
-A1:A1:unknown:model:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge.retcode b/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge.retcode
+++ b/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net b/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
deleted file mode 100644
index 5c04b06..0000000
--- a/gnetlist/tests/common/outputs/bom2/JD_nomunge-output.net
+++ /dev/null
@@ -1,12 +0,0 @@
-refdes:refdes:value:device:qty
-X1:X1:unknown:LVD:1
-M1:M1:unknown:PMOS_TRANSISTOR:1
-Rb:Rb:5.6k:RESISTOR:1
-Rt:Rt:1k:RESISTOR:1
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
-Rlm:Rlm:500k:RESISTOR:1
-Rlp:Rlp:1meg:RESISTOR:1
-Cp:Cp:20p:CAPACITOR:1
-Cm:Cm:20p:CAPACITOR:1
-A1:A1:unknown:model:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode b/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
+++ b/gnetlist/tests/common/outputs/bom2/JD_nomunge.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
deleted file mode 100644
index 8112a83..0000000
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
+++ /dev/null
@@ -1,24 +0,0 @@
-refdes:refdes:value:device:qty
-Q1:Q1:unknown:NPN_TRANSISTOR:1
-R5:R5:10:RESISTOR:1
-R1:R1:28K:RESISTOR:1
-R2:R2:2K:RESISTOR:1
-RE1:RE1:100:RESISTOR:1
-RC2:RC2:1K:RESISTOR:1
-RL:RL:100K:RESISTOR:1
-Cout:Cout:2.2uF:CAPACITOR:1
-CE1:CE1:1pF:CAPACITOR:1
-Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin:1
-VCC:VCC:DC 15V:VOLTAGE_SOURCE:1
-A1:A1:unknown:model:1
-A2:A2:unknown:include:1
-A3:A3:.options TEMP=25:directive:1
-C1:C1:2.2uF:CAPACITOR:1
-Q2:Q2:unknown:NPN_TRANSISTOR:1
-RC1:RC1:3.3K:RESISTOR:1
-RE2:RE2:100:RESISTOR:1
-CE2:CE2:1pF:CAPACITOR:1
-R8:R8:1:RESISTOR:1
-R3:R3:28K:RESISTOR:1
-R4:R4:2.8K:RESISTOR:1
-C2:C2:2.2uF:CAPACITOR:1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include.retcode b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include.retcode
+++ b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include.retcode
@@ -1 +1 @@
-0
+1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
deleted file mode 100644
index 8112a83..0000000
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
+++ /dev/null
@@ -1,24 +0,0 @@
-refdes:refdes:value:device:qty
-Q1:Q1:unknown:NPN_TRANSISTOR:1
-R5:R5:10:RESISTOR:1
-R1:R1:28K:RESISTOR:1
-R2:R2:2K:RESISTOR:1
-RE1:RE1:100:RESISTOR:1
-RC2:RC2:1K:RESISTOR:1
-RL:RL:100K:RESISTOR:1
-Cout:Cout:2.2uF:CAPACITOR:1
-CE1:CE1:1pF:CAPACITOR:1
-Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin:1
-VCC:VCC:DC 15V:VOLTAGE_SOURCE:1
-A1:A1:unknown:model:1
-A2:A2:unknown:include:1
-A3:A3:.options TEMP=25:directive:1
-C1:C1:2.2uF:CAPACITOR:1
-Q2:Q2:unknown:NPN_TRANSISTOR:1
-RC1:RC1:3.3K:RESISTOR:1
-RE2:RE2:100:RESISTOR:1
-CE2:CE2:1pF:CAPACITOR:1
-R8:R8:1:RESISTOR:1
-R3:R3:28K:RESISTOR:1
-R4:R4:2.8K:RESISTOR:1
-C2:C2:2.2uF:CAPACITOR:1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort.retcode b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort.retcode
index 573541a..d00491f 100644
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort.retcode
+++ b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort.retcode
@@ -1 +1 @@
-0
+1
commit b0613e375ab887d4a5ed5c3022a12c485cad1ab2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Make common tests cope with no output.
Some gnetlist backends may fail, expectedly, without generating
output. Update common gnetlist test harness to cope with this.
diff --git a/gnetlist/tests/common/run_backend_tests.sh b/gnetlist/tests/common/run_backend_tests.sh
index 1882634..54caa88 100755
--- a/gnetlist/tests/common/run_backend_tests.sh
+++ b/gnetlist/tests/common/run_backend_tests.sh
@@ -245,7 +245,15 @@ for t in $all_tests ; do
fi
if test "X$regen" = "Xyes" ; then
- cp ${out} ${ref}
+
+ # Copy output on top of golden output, accounting for the case
+ # that no output file was generated.
+ if test -f ${out} ; then
+ cp ${out} ${ref}
+ else
+ rm ${ref}
+ fi
+
echo "$rc" > $refcode
echo "Regenerated ${ref}"
good=1
@@ -260,6 +268,10 @@ for t in $all_tests ; do
if diff -w ${out}.tmp1 ${out}.tmp2 >/dev/null ; then
echo "PASS"
good=1
+ # If neither output nor golden file exists, then succeed
+ elif test ! -f ${out} -a ! -f ${ref} ; then
+ echo "PASS"
+ good=1
else
echo "FAILED: See diff -w ${ref} ${out}"
bad=1
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs