[Rivet-svn] r2256 - trunk/test

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Feb 11 15:57:19 2010
New Revision: 2256

Log:
Various improvements to the tests... i.e. they now pass ;)

Modified:
   trunk/test/Makefile.am

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Thu Feb 11 15:56:55 2010	(r2255)
+++ trunk/test/Makefile.am	Thu Feb 11 15:57:19 2010	(r2256)
@@ -14,12 +14,15 @@
 testApi_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS)
 
-export RIVET_REF_PATH=$(top_builddir)/data/refdata
-export RIVET_DATA_PATH=$(top_builddir)/data/refdata
-export LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(top_builddir)/src/Analyses/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH)
-export PYTHONPATH=$(shell ls -d $(top_builddir)/pyext/build/lib.*)
-export PATH=$(top_builddir)/bin:$(shell echo $$PATH)
+## TODO: Move these non-POSIX shell escapes into variable exports from configure.ac
+TESTS_ENVIRONMENT = \
+  RIVET_REF_PATH=$(top_builddir)/data/refdata \
+  RIVET_DATA_PATH=$(top_builddir)/data/refdata \
+  RIVET_ANALYSIS_PATH=$(top_builddir)/src/Analyses/.libs \
+  LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH) \
+  PYTHONPATH=$(shell ls -d $(top_builddir)/pyext/build/lib.*) \
+  PATH=$(top_builddir)/bin:$(shell echo $$PATH)
 
 TESTS = testMatVec testBoost testCmp testApi testCmdLine.sh
 
-EXTRA_DIST = testApi.hepmc
+EXTRA_DIST = testApi.hepmc testCmdLine.sh