[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-30-g989908d)
The branch, master has been updated
via 989908d06ad71c2cc883e32b23f61a34200f1b98 (commit)
from c38b5069f3fee207c48281da49ac1c90cf5d508a (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/Makefile.am | 3 ++-
gnetlist/tests/common/always-copy.list | 1 +
gnetlist/tests/common/inputs/gafrc | 4 ++++
gnetlist/tests/common/run_backend_tests.sh | 3 +++
gnetlist/tests/hierarchy/Makefile.am | 7 ++-----
gnetlist/tests/hierarchy/gnetlistrc.hierarchy | 4 ++++
gnetlist/tests/hierarchy2/Makefile.am | 7 ++++---
gnetlist/tests/hierarchy2/gafrc.hierarchy2 | 4 ++++
8 files changed, 24 insertions(+), 9 deletions(-)
=================
Commit Messages
=================
commit 989908d06ad71c2cc883e32b23f61a34200f1b98
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Point at the correct gnetlist and scheme files for all tests.
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.
Point at the locally built but perhaps not yet installed gnetlist
when running 'make check'. This helps make sure we are testing
the right gnetlist.
While here also improve the shell portability a little by using
FOO=value
export FOO
instead of
export FOO=value
which is not quite as portable.
:100644 100644 4cb223d... 5dc5d20... M gnetlist/tests/Makefile.am
:100644 100644 aee1abb... 1ccfdd3... M gnetlist/tests/common/always-copy.list
:100644 100644 7408ef0... bff7fbb... M gnetlist/tests/common/inputs/gafrc
:100755 100755 933ce50... 40b6592... M gnetlist/tests/common/run_backend_tests.sh
:100644 100644 1d8f694... d098c50... M gnetlist/tests/hierarchy/Makefile.am
:100644 100644 8f48bfc... 15cb508... M gnetlist/tests/hierarchy/gnetlistrc.hierarchy
:100644 100644 8abe31b... 559c478... M gnetlist/tests/hierarchy2/Makefile.am
:100644 100644 8f48bfc... 15cb508... M gnetlist/tests/hierarchy2/gafrc.hierarchy2
=========
Changes
=========
commit 989908d06ad71c2cc883e32b23f61a34200f1b98
Author: Dan McMahill <dan@xxxxxxxxxxxx>
Commit: Dan McMahill <dan@xxxxxxxxxxxx>
Point at the correct gnetlist and scheme files for all tests.
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.
Point at the locally built but perhaps not yet installed gnetlist
when running 'make check'. This helps make sure we are testing
the right gnetlist.
While here also improve the shell portability a little by using
FOO=value
export FOO
instead of
export FOO=value
which is not quite as portable.
diff --git a/gnetlist/tests/Makefile.am b/gnetlist/tests/Makefile.am
index 4cb223d..5dc5d20 100644
--- a/gnetlist/tests/Makefile.am
+++ b/gnetlist/tests/Makefile.am
@@ -20,6 +20,7 @@ check_SCRIPTS = tests
BUILDDIR=$(top_builddir)/tests
SRCDIR=$(srcdir)
+GNETLIST=$(top_builddir)/src/gnetlist
tests:
@@ -135,7 +136,7 @@ tests_ales:
$(BUILDDIR) $(SRCDIR)
# switcap (does not work with make distcheck due to local test.ana file)
- gnetlist -o $(BUILDDIR)/new_skt.switcap -g switcap \
+ $(GNETLIST) -o $(BUILDDIR)/new_skt.switcap -g switcap \
$(SRCDIR)/../examples/switcap/ckt.sch \
$(SRCDIR)/../examples/switcap/clocks.sch \
$(SRCDIR)/../examples/switcap/analysis.sch
diff --git a/gnetlist/tests/common/always-copy.list b/gnetlist/tests/common/always-copy.list
index aee1abb..1ccfdd3 100644
--- a/gnetlist/tests/common/always-copy.list
+++ b/gnetlist/tests/common/always-copy.list
@@ -1 +1,2 @@
attribs
+gafrc
diff --git a/gnetlist/tests/common/inputs/gafrc b/gnetlist/tests/common/inputs/gafrc
index 7408ef0..bff7fbb 100644
--- a/gnetlist/tests/common/inputs/gafrc
+++ b/gnetlist/tests/common/inputs/gafrc
@@ -1 +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 "${SCMDIR}")
+
(component-library "./sym")
diff --git a/gnetlist/tests/common/run_backend_tests.sh b/gnetlist/tests/common/run_backend_tests.sh
index 933ce50..40b6592 100755
--- a/gnetlist/tests/common/run_backend_tests.sh
+++ b/gnetlist/tests/common/run_backend_tests.sh
@@ -83,6 +83,8 @@ srcdir=${srcdir:-$here}
srcdir=`cd $srcdir && pwd`
GNETLIST=../../../src/gnetlist
+SCMDIR=../../../scheme
+export SCMDIR
rundir=${here}/run
@@ -123,6 +125,7 @@ srcdir: $srcdir
INPUT_DIR: ${INPUT_DIR}
GOLDEN_DIR: ${GOLDEN_DIR}
GNETLIST: ${GNETLIST}
+SCMDIR: ${SCMDIR}
all_tests:
${all_tests}
diff --git a/gnetlist/tests/hierarchy/Makefile.am b/gnetlist/tests/hierarchy/Makefile.am
index 1d8f694..d098c50 100644
--- a/gnetlist/tests/hierarchy/Makefile.am
+++ b/gnetlist/tests/hierarchy/Makefile.am
@@ -17,9 +17,9 @@ tests: tests-job tests-clean
tests-job:
rm -f $(BUILDDIR)/new_*
- ( export TESTDIR=$(SRCDIR); \
+ cp -f $(SRCDIR)/gnetlistrc.hierarchy $(BUILDDIR)/gnetlistrc
+ ( TESTDIR=$(SRCDIR); export TESTDIR ; SCMDIR=${top_srcdir}/scheme ; export SCMDIR ; \
echo $$TESTDIR; \
- cp -f $(SRCDIR)/gnetlistrc.hierarchy $(BUILDDIR)/gnetlistrc; \
$(GNETLIST) \
-o $(BUILDDIR)/new_hierarchy.geda -g geda \
$(SRCDIR)/top.sch )
@@ -32,6 +32,3 @@ MOSTLYCLEANFILES = new_* core *.log FILE *.ps *~
CLEANFILES = new_* core *.log FILE *.ps *~
DISTCLEANFILES = *.log core FILE *~ prototype.bak
MAINTAINERCLEANFILES = new_* core *.log FILE *.ps *~ Makefile.in configure
-
-
-
diff --git a/gnetlist/tests/hierarchy/gnetlistrc.hierarchy b/gnetlist/tests/hierarchy/gnetlistrc.hierarchy
index 8f48bfc..15cb508 100644
--- a/gnetlist/tests/hierarchy/gnetlistrc.hierarchy
+++ b/gnetlist/tests/hierarchy/gnetlistrc.hierarchy
@@ -1,3 +1,7 @@
+;; 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 "${SCMDIR}")
+
(source-library "${TESTDIR}")
(component-library "${TESTDIR}")
;(net-naming-priority "label")
diff --git a/gnetlist/tests/hierarchy2/Makefile.am b/gnetlist/tests/hierarchy2/Makefile.am
index 8abe31b..559c478 100644
--- a/gnetlist/tests/hierarchy2/Makefile.am
+++ b/gnetlist/tests/hierarchy2/Makefile.am
@@ -8,15 +8,16 @@ check_SCRIPTS = tests
BUILDDIR=$(top_builddir)/tests/hierarchy2
SRCDIR=$(srcdir)
+GNETLIST=$(top_builddir)/src/gnetlist
tests: tests-job tests-clean
tests-job:
rm -f $(BUILDDIR)/new_*
- ( export TESTDIR=$(SRCDIR); \
+ cp -f $(SRCDIR)/gafrc.hierarchy2 $(BUILDDIR)/gafrc
+ ( TESTDIR=$(SRCDIR); export TESTDIR ; SCMDIR=${top_srcdir}/scheme ; export SCMDIR ; \
echo $$TESTDIR; \
- cp -f $(SRCDIR)/gafrc.hierarchy2 $(BUILDDIR)/gafrc; \
- gnetlist \
+ $(GNETLIST) \
-o $(BUILDDIR)/new_hierarchy2.geda -g geda \
$(SRCDIR)/top.sch )
diff $(SRCDIR)/hierarchy2.geda $(BUILDDIR)/new_hierarchy2.geda;
diff --git a/gnetlist/tests/hierarchy2/gafrc.hierarchy2 b/gnetlist/tests/hierarchy2/gafrc.hierarchy2
index 8f48bfc..15cb508 100644
--- a/gnetlist/tests/hierarchy2/gafrc.hierarchy2
+++ b/gnetlist/tests/hierarchy2/gafrc.hierarchy2
@@ -1,3 +1,7 @@
+;; 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 "${SCMDIR}")
+
(source-library "${TESTDIR}")
(component-library "${TESTDIR}")
;(net-naming-priority "label")
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs