SF.net SVN: openvrml:[3929] trunk

[<br...@us...>]

Revision: 3929
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3929&view=rev
Author:   braden
Date:     2009-06-24 03:20:41 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
Set OPENVRML_NODE_PATH and OPENVRML_SCRIPT_PATH when running the test programs.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tests/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-23 03:40:35 UTC (rev 3928)
+++ trunk/ChangeLog	2009-06-24 03:20:41 UTC (rev 3929)
@@ -1,3 +1,13 @@
+2009-06-23 Braden McDaniel  <br...@en...>
+
+	Set OPENVRML_NODE_PATH and OPENVRML_SCRIPT_PATH when running the
+	test programs.
+
+	* tests/Makefile.am
+	(TESTS_ENVIRONMENT): Set OPENVRML_NODE_PATH and
+	OPENVRML_SCRIPT_PATH.
+	(check-local): Reuse TESTS_ENVIRONMENT.
+
 2009-06-22 Braden McDaniel  <br...@en...>
 
 	* configure.ac: Check to see whether the pertinent precious

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2009-06-23 03:40:35 UTC (rev 3928)
+++ trunk/tests/Makefile.am	2009-06-24 03:20:41 UTC (rev 3929)
@@ -5,7 +5,12 @@
 AM_CXXFLAGS = $(PTHREAD_CFLAGS)
 AM_LDFLAGS = $(OPENVRML_RPATH)
 
-TESTS_ENVIRONMENT = BOOST_TEST_REPORT_LEVEL=no OPENVRML_DATADIR=$(abs_top_srcdir)/data
+TESTS_ENVIRONMENT = \
+        BOOST_TEST_REPORT_LEVEL=no \
+        OPENVRML_DATADIR=$(abs_top_srcdir)/data \
+        OPENVRML_NODE_PATH=$(abs_top_builddir)/src/node \
+        OPENVRML_SCRIPT_PATH=$(abs_top_builddir)/src/script
+
 TESTS = color \
         rotation \
         mat4f \
@@ -122,7 +127,7 @@
 
 TESTSUITE = $(srcdir)/testsuite
 check-local: atconfig atlocal $(TESTSUITE)
-	$(SHELL) $(TESTSUITE) OPENVRML_DATADIR=$(abs_top_srcdir)/data
+	$(SHELL) $(TESTSUITE) $(TESTS_ENVIRONMENT)
 
 AUTOTEST = autom4te --language=autotest
 $(TESTSUITE): $(srcdir)/package.m4 $(srcdir)/testsuite.at


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.