[Rivet-svn] r2263 - trunk/test

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Feb 12 00:01:05 2010
New Revision: 2263

Log:
Neaten up environment to not use non-POSIX make extensions

Modified:
   trunk/test/Makefile.am
   trunk/test/testCmdLine.sh

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Thu Feb 11 21:49:24 2010	(r2262)
+++ trunk/test/Makefile.am	Fri Feb 12 00:01:05 2010	(r2263)
@@ -14,14 +14,13 @@
 testApi_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS)
 
-## TODO: Move these non-POSIX shell escapes into variable exports from configure.ac
 TESTS_ENVIRONMENT = \
   RIVET_REF_PATH=$(top_builddir)/data/refdata \
   RIVET_INFO_PATH=$(top_builddir)/data/anainfo \
   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)
+  PYTHON_BUILD_DIR=$(top_builddir)/pyext/build \
+  PATH=$(top_builddir)/bin:$(PATH)
 
 TESTS = testMatVec testBoost testCmp testApi testCmdLine.sh
 

Modified: trunk/test/testCmdLine.sh
==============================================================================
--- trunk/test/testCmdLine.sh	Thu Feb 11 21:49:24 2010	(r2262)
+++ trunk/test/testCmdLine.sh	Fri Feb 12 00:01:05 2010	(r2263)
@@ -1,4 +1,6 @@
-#!/bin/bash
+#! /usr/bin/env bash
+
+export PYTHONPATH=$(ls -d $PYTHON_BUILD_DIR/lib.*)
 
 cp testApi.hepmc file2.hepmc
 (rivet -a D0_2008_S7554427 testApi.hepmc file2.hepmc | grep -q "20 events") || exit 1