gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-329-g40e4a08)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  40e4a0836529f91ee141463832beb4fea0d845ec (commit)
      from  817e5dcfe478ae02f60d74ca1574518a1976bd17 (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
=========

 gnetlist/tests/drc2/Makefile.am     |   11 +++++++++--
 gnetlist/tests/drc2/gnetlistrc.drc2 |    5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 gnetlist/tests/drc2/gnetlistrc.drc2


=================
 Commit Messages
=================

commit 40e4a0836529f91ee141463832beb4fea0d845ec
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Mon Dec 1 20:34:02 2008 -0500

    Use the uninstalled scheme files instead of installed scheme files.
    
    When running the tests, point at the not-yet-installed scheme files.
    This lets 'make check' test out what you just built instead of something
    that is installed that may be sorely out of date.

:100644 100644 b244fd3... 82c943a... M	gnetlist/tests/drc2/Makefile.am
:000000 100644 0000000... 7304851... A	gnetlist/tests/drc2/gnetlistrc.drc2

=========
 Changes
=========

commit 40e4a0836529f91ee141463832beb4fea0d845ec
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Date:   Mon Dec 1 20:34:02 2008 -0500

    Use the uninstalled scheme files instead of installed scheme files.
    
    When running the tests, point at the not-yet-installed scheme files.
    This lets 'make check' test out what you just built instead of something
    that is installed that may be sorely out of date.

diff --git a/gnetlist/tests/drc2/Makefile.am b/gnetlist/tests/drc2/Makefile.am
index b244fd3..82c943a 100644
--- a/gnetlist/tests/drc2/Makefile.am
+++ b/gnetlist/tests/drc2/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = duplicated-refdes.sch duplicated-refdes.drc2 \
 	     duplicated_slot.sch duplicated_slot.drc2 \
 	     gnd-with-nc-directive.sch gnd-with-nc-directive.drc2 \
 	     gnd-without-nc-directive.sch gnd-without-nc-directive.drc2 \
+	     gnetlistrc.drc2 \
 	     net-not-driven.sch net-not-driven.drc2 \
 	     net-not-driven-with-dont-check-if-driven-directive.sch \
 	     net-not-driven-with-dont-check-if-driven-directive.drc2 \
@@ -48,6 +49,12 @@ tests:
 	rm -f $(BUILDDIR)/new_*
 	rm -f $(BUILDDIR)/failed.log
 
+# copy required file(s)
+	sed \
+		-e 's;@scheme_srcdir@;${top_srcdir}/scheme;g' \
+		-e 's;@scheme_builddir@;${top_builddir}/scheme;g' \
+		$(SRCDIR)/gnetlistrc.drc2 > $(BUILDDIR)/gnetlistrc
+
 # make the tests
 	failed=0; \
 	for file in $(SRCDIR)/*.sch; do \
@@ -72,8 +79,8 @@ tests:
 		exit 1 ; \
 	fi
 
-MOSTLYCLEANFILES = new_* core *.log FILE *.ps *~
-CLEANFILES = new_* core *.log FILE *.ps *~
+MOSTLYCLEANFILES = new_* core *.log FILE *.ps *~ gnetlistrc
+CLEANFILES = new_* core *.log FILE *.ps *~ gnetlistrc
 DISTCLEANFILES = *.log core FILE *~ prototype.bak
 MAINTAINERCLEANFILES = new_* core *.log FILE *.ps *~ Makefile.in configure
 
diff --git a/gnetlist/tests/drc2/gnetlistrc.drc2 b/gnetlist/tests/drc2/gnetlistrc.drc2
new file mode 100644
index 0000000..7304851
--- /dev/null
+++ b/gnetlist/tests/drc2/gnetlistrc.drc2
@@ -0,0 +1,5 @@
+;; We want to point at the scheme code that hasn't been installed yet so that
+;; 'make check' during development can work correctly.
+(scheme-directory "@scheme_srcdir@")
+(scheme-directory "@scheme_builddir@")
+




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