[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: CVS update: Makefile.am



  User: ahvezda 
  Date: 07/04/21 15:13:39

  Modified:    .        Makefile.am
  Added:       .        runtest.sh singlenet.protelII stack_1.geda
  Removed:     .        singlenet.protel stack.geda
  Log:
  A bunch of work/changes to get "make distcheck" to work correctly (run all the 
  
  regression tests when doing check and distcheck)
  
  
  
  
  Revision  Changes    Path
  1.17      +93 -63    eda/geda/gaf/gnetlist/tests/Makefile.am
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gnetlist/tests/Makefile.am,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- Makefile.am	21 Apr 2007 17:16:10 -0000	1.16
  +++ Makefile.am	21 Apr 2007 19:13:39 -0000	1.17
  @@ -2,105 +2,135 @@
   
   SUBDIRS = hierarchy drc2 spice-sdb
   
  -EXTRA_DIST = 7447.vhdl README amp.spice darlington.spice netattrib.geda \
  +EXTRA_DIST = runtest.sh \
  +	     7447.vhdl README amp.spice darlington.spice netattrib.geda \
   	     netattrib.sch powersupply.PCB powersupply.allegro \
                powersupply.bae powersupply.geda powersupply.maxascii \
                powersupply.pads powersupply.protelII powersupply.sch \
                powersupply.tango singlenet.PCB singlenet.geda singlenet.pads \
  -             singlenet.protel singlenet.sch stack.geda amp.spice-sdb \
  +             singlenet.protelII singlenet.sch stack_1.geda amp.spice-sdb \
   	     darlington.spice-sdb skt.switcap test.ana multiequal.sch \
   	     multiequal.spice-sdb gnetlistrc.vhdl
   
  -# Temporarily disabled make check, since this is interfering with 
  -# make distcheck
  -#check_SCRIPTS = tests
  +check_SCRIPTS = tests
  +
  +BUILDDIR=$(top_builddir)/tests
  +SRCDIR=$(srcdir)
   
   tests:
  +
   # cleanup
  -	rm -f new_*
  -	rm -rf devfiles
  -	mkdir devfiles
  +	rm -f $(BUILDDIR)/new_*
  +	rm -rf $(BUILDDIR)/devfiles
  +	mkdir $(BUILDDIR)/devfiles
  +
   # netattrib gEDA 
  -	gnetlist -o new_netattrib.geda -g geda ./netattrib.sch
  -	diff netattrib.geda new_netattrib.geda
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/netattrib.sch geda \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # stack gEDA 
  -	gnetlist -o new_stack.geda -g geda ../../gschem/examples/stack_1.sch
  -	diff stack.geda new_stack.geda
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/../examples/stack_1.sch geda \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # 7447 VHDL
  -	cp -f ./gnetlistrc.vhdl ./gnetlistrc
  -	gnetlist -o new_7447.vhdl -g vhdl ../examples/7447.sch
  -	diff 7447.vhdl new_7447.vhdl
  -	rm -f ./gnetlistrc
  +	cp -f $(SRCDIR)/gnetlistrc.vhdl $(BUILDDIR)/gnetlistrc
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/../examples/7447.sch vhdl \
  +		$(BUILDDIR) $(SRCDIR)
  +	rm -f $(BUILDDIR)/gnetlistrc
  +
   # singlenet gEDA 
  -	gnetlist -o new_singlenet.geda -g geda ./singlenet.sch
  -	diff singlenet.geda new_singlenet.geda
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch geda \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # singlenet PCB 
  -	gnetlist -o new_singlenet.PCB -g PCB ./singlenet.sch
  -	diff singlenet.PCB new_singlenet.PCB
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch PCB \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # singlenet PADS
  -	gnetlist -o new_singlenet.pads -g pads ./singlenet.sch
  -	diff singlenet.pads new_singlenet.pads
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch pads \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # singlenet protelII
  -	gnetlist -o new_singlenet.protel -g protelII ./singlenet.sch
  -	diff singlenet.protel new_singlenet.protel
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/singlenet.sch protelII \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply PCB
  -	gnetlist -o new_powersupply.PCB -g PCB ./powersupply.sch
  -	diff powersupply.PCB new_powersupply.PCB
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch PCB \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply Allegro
  -	gnetlist -o new_powersupply.allegro -g allegro ./powersupply.sch
  -	diff powersupply.allegro new_powersupply.allegro
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch allegro \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply bae
  -	gnetlist -o new_powersupply.bae -g bae ./powersupply.sch
  -	diff powersupply.bae new_powersupply.bae
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch bae \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply gEDA
  -	gnetlist -o new_powersupply.geda -g geda ./powersupply.sch
  -	diff powersupply.geda new_powersupply.geda
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch geda \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply maxascii
  -	gnetlist -o new_powersupply.maxascii -g maxascii ./powersupply.sch
  -	diff powersupply.maxascii new_powersupply.maxascii
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch maxascii \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply pads
  -	gnetlist -o new_powersupply.pads -g pads ./powersupply.sch
  -	diff powersupply.pads new_powersupply.pads
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch pads \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply protelII
  -	gnetlist -o new_powersupply.protelII -g protelII ./powersupply.sch
  -	diff powersupply.protelII new_powersupply.protelII
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch protelII \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # powersupply tango
  -	gnetlist -o new_powersupply.tango -g tango ./powersupply.sch
  -	diff powersupply.tango new_powersupply.tango
  -# switcap 
  -	gnetlist -o new_skt.switcap -g switcap ../examples/switcap/ckt.sch \
  -		../examples/switcap/clocks.sch ../examples/switcap/analysis.sch
  -	diff skt.switcap new_skt.switcap
  -	diff new_skt.switcap ../examples/switcap/example.scn
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/powersupply.sch tango \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # multiple equals in attributes SPICE-SDB 
  -	gnetlist -o new_multiequal.spice-sdb -g spice-sdb \
  -		./multiequal.sch
  -	diff multiequal.spice-sdb new_multiequal.spice-sdb
  +	$(SRCDIR)/runtest.sh $(SRCDIR)/multiequal.sch spice-sdb \
  +		$(BUILDDIR) $(SRCDIR) "-I gnetlist"
  +
  +# Cleanup
  +	rm -f $(BUILDDIR)/new_*
  +	rm -rf $(BUILDDIR)/devfiles
   
   
   # These tests are internal to Ales and will not work without the schematics
   # which I am unable to distribute (due to copyright laws).
   tests_ales:
  +
   # cleanup
  -	rm -f new_*
  -	rm -rf devfiles
  -	mkdir devfiles
  +	rm -f $(BUILDDIR)/new_*
  +	rm -rf $(BUILDDIR)/devfiles
  +	mkdir $(BUILDDIR)/devfiles
  +
   # amp SPICE 
  -	gnetlist -o new_amp.spice -g spice \
  -		/home/ahvezda/gEDA/alesch/amp.sch
  -	diff amp.spice new_amp.spice
  +	$(SRCDIR)/runtest.sh $(HOME)/gEDA/alesch/amp.sch spice \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # darlington SPICE 
  -	gnetlist -o new_darlington.spice -g spice \
  -		/home/ahvezda/gEDA/alesch/darlington.sch
  -	diff darlington.spice new_darlington.spice
  +	$(SRCDIR)/runtest.sh $(HOME)/gEDA/alesch/darlington.sch spice \
  +		$(BUILDDIR) $(SRCDIR)
  +
   # amp SPICE SDB
  -	gnetlist -o new_amp.spice-sdb -g spice-sdb \
  -		/home/ahvezda/gEDA/alesch/amp.sch
  -	diff amp.spice-sdb new_amp.spice-sdb
  +	$(SRCDIR)/runtest.sh $(HOME)/gEDA/alesch/amp.sch spice-sdb \
  +		$(BUILDDIR) $(SRCDIR) "-I gnetlist"
  +
   # darlington SPICE SDB
  -	gnetlist -o new_darlington.spice-sdb -g spice-sdb \
  -		/home/ahvezda/gEDA/alesch/darlington.sch
  -	diff darlington.spice-sdb new_darlington.spice-sdb
  +	$(SRCDIR)/runtest.sh $(HOME)/gEDA/alesch/darlington.sch spice-sdb \
  +		$(BUILDDIR) $(SRCDIR) "-I gnetlist"
  +
  +# switcap (does not work with make distcheck due to local test.ana file)
  +	gnetlist -o $(BUILDDIR)/new_skt.switcap -g switcap \
  +		$(SRCDIR)/../examples/switcap/ckt.sch \
  +		$(SRCDIR)/../examples/switcap/clocks.sch \
  +		$(SRCDIR)/../examples/switcap/analysis.sch
  +	diff $(SRCDIR)/skt.switcap $(BUILDDIR)/new_skt.switcap
  +	diff $(SRCDIR)/../examples/switcap/example.scn $(SRCDIR)/new_skt.switcap
  +
  +# cleanup
  +	rm -f $(BUILDDIR)/new_*
  +	rm -rf $(BUILDDIR)/devfiles
   
   MOSTLYCLEANFILES = new_* core *.log FILE *.ps *~
   CLEANFILES = new_* core *.log FILE *.ps *~
  
  
  
  1.1                  eda/geda/gaf/gnetlist/tests/runtest.sh
  
  Index: runtest.sh
  ===================================================================
  #!/bin/sh
  
  INPUT=$1
  BACKEND=$2
  BUILDDIR=$3
  SRCDIR=$4
  EXTRADIFF=$5
  
  export TESTDIR=${BUILDDIR}
  
  schbasename=`basename $INPUT .sch`
  
  gnetlist -o ${BUILDDIR}/new_${schbasename}.$BACKEND -g $BACKEND $INPUT 
  
  diff $EXTRADIFF ${SRCDIR}/${schbasename}.$BACKEND ${BUILDDIR}/new_${schbasename}.$BACKEND
  
  
  
  
  1.1                  eda/geda/gaf/gnetlist/tests/singlenet.protelII
  
  Index: singlenet.protelII
  ===================================================================
  PROTEL NETLIST 2.0
  [
  DESIGNATOR
  U100
  FOOTPRINT
  DIP14
  PARTTYPE
  7400
  DESCRIPTION
  7400
  Part Field 1
  *
  Part Field 2
  *
  Part Field 3
  *
  Part Field 4
  *
  Part Field 5
  *
  Part Field 6
  *
  Part Field 7
  *
  Part Field 8
  *
  Part Field 9
  *
  Part Field 10
  *
  Part Field 11
  *
  Part Field 12
  *
  Part Field 13
  *
  Part Field 14
  *
  Part Field 15
  *
  Part Field 16
  *
  LIBRARYFIELD1
  
  LIBRARYFIELD2
  
  LIBRARYFIELD3
  
  LIBRARYFIELD4
  
  LIBRARYFIELD5
  
  LIBRARYFIELD6
  
  LIBRARYFIELD7
  
  LIBRARYFIELD8
  
  ]
  (
  SINGLE_NET2
  U100-1 7400-1 PASSIVE
  U100-3 7400-3 PASSIVE 
  )
  (
  GND
  U100-7 7400-7 PASSIVE 
  )
  (
  Vcc
  U100-14 7400-14 PASSIVE 
  )
  (
  SINGLE_NET
  U100-4 7400-4 PASSIVE
  U100-5 7400-5 PASSIVE
  U100-10 7400-10 PASSIVE
  U100-8 7400-8 PASSIVE
  U100-9 7400-9 PASSIVE
  U100-6 7400-6 PASSIVE 
  )
  
  
  
  1.1                  eda/geda/gaf/gnetlist/tests/stack_1.geda
  
  Index: stack_1.geda
  ===================================================================
  START header
  
  gEDA's netlist format
  Created specifically for testing of gnetlist
  
  END header
  
  START components
  
  U211 device=74191
  U210 device=74541
  U109 device=AM9128
  U212 device=74191
  
  END components
  
  START renamed-nets
  
  
  END renamed-nets
  
  START nets
  
  SP_BUS_L : U210 1 
  unnamed_net1 : U211 13, U212 4 
  BUS_SP_L : U211 11, U212 11 
  CLK_SP_L : U211 14, U212 14 
  SPUP_L : U211 5, U212 5 
  Vcc : U210 20, U211 16, U212 16, U109 24 
  SEL_DS_L : U210 19, U211 4, U109 18 
  STACK_BUS_L : U109 20 
  BUS_STACK_L : U109 21 
  DS_ADDRS4_H : U210 5, U212 3, U109 4 
  DS_ADDRS5_H : U210 4, U212 2, U109 3 
  DS_ADDRS6_H : U210 3, U212 6, U109 2 
  DS_ADDRS7_H : U210 2, U212 7, U109 1 
  GND : U210 10, U211 8, U212 8, U109 12, U109 19, U109 22, U109 23 
  DS_ADDRS3_H : U210 6, U211 7, U109 5 
  DS_ADDRS2_H : U210 7, U211 6, U109 6 
  DS_ADDRS0_H : U210 9, U211 3, U109 8 
  DS_ADDRS1_H : U210 8, U211 2, U109 7 
  DATA0_H : U210 11, U211 15, U109 9 
  DATA1_H : U210 12, U211 1, U109 10 
  DATA2_H : U210 13, U211 10, U109 11 
  DATA3_H : U210 14, U211 9, U109 13 
  DATA4_H : U210 15, U212 15, U109 14 
  DATA5_H : U210 16, U212 1, U109 15 
  DATA6_H : U210 17, U212 10, U109 16 
  DATA7_H : U210 18, U212 9, U109 17 
  
  END nets
  
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs