Changeset 1169

Timestamp:

16/01/09 12:31:29 (3 years ago)

Author:

Freddie Akeroyd

Message:

Change directory when running python tests. Refs #101.

Location:

trunk/test

Files:

• Makefile.am (modified) (1 diff)
• testsuite.at (modified) (1 diff)

trunk/test/Makefile.am

@@ -119 +119 @@
 # this sets the test running environment - in case we
 # have got built with shared HDF libraries we need to set LD_LIBRARY_PATH
-TESTS_ENVIRONMENT=env LD_LIBRARY_PATH=@abs_top_builddir@/src/.libs:@abs_top_builddir@/bindings/cpp/.libs:$${LD_LIBRARY_PATH}:@EXTRA_LD_LIBRARY_PATH@:/usr/local/lib DYLD_LIBRARY_PATH=@abs_top_builddir@/src/.libs:@abs_top_builddir@/bindings/cpp/.libs:$${DYLD_LIBRARY_PATH}:@EXTRA_LD_LIBRARY_PATH@:/usr/local/lib
+TESTS_ENVIRONMENT=env PYTHON=$(PYTHON) LD_LIBRARY_PATH=@abs_top_builddir@/src/.libs:@abs_top_builddir@/bindings/cpp/.libs:$${LD_LIBRARY_PATH}:@EXTRA_LD_LIBRARY_PATH@:/usr/local/lib DYLD_LIBRARY_PATH=@abs_top_builddir@/src/.libs:@abs_top_builddir@/bindings/cpp/.libs:$${DYLD_LIBRARY_PATH}:@EXTRA_LD_LIBRARY_PATH@:/usr/local/lib
 
 run_test_SOURCES=run_test.c

trunk/test/testsuite.at

@@ -570 +570 @@
 AT_BANNER([[Testing the Python bindings.]])
 AT_SETUP([Checking HDF4 test file])
-AT_CHECK([$HAVE_HDF4 && $HAVE_PYTHON && python $abs_srcdir/../bindings/python/nxstest.py -q hdf4 | sed -e 's/\r$//' ],[], 
+AT_CHECK([$HAVE_HDF4 && $HAVE_PYTHON && ( cd $abs_srcdir/../bindings/python; $PYTHON nxstest.py -q hdf4 | sed -e 's/\r$//' ) ],[], 
 [[]])
 AT_CLEANUP
 AT_SETUP([Checking HDF5 test file])
-AT_CHECK([$HAVE_HDF5 && $HAVE_PYTHON && python $abs_srcdir/../bindings/python/nxstest.py -q hdf5 | sed -e 's/\r$//' ],[], 
+AT_CHECK([$HAVE_HDF5 && $HAVE_PYTHON && ( cd $abs_srcdir/../bindings/python; $PYTHON nxstest.py -q hdf5 | sed -e 's/\r$//' ) ],[], 
 [[]])
 AT_CLEANUP
 AT_SETUP([Checking XML test file])
-AT_CHECK([$HAVE_XML && $HAVE_PYTHON && python $abs_srcdir/../bindings/python/nxstest.py -q xml | sed -e 's/\r$//' ],[], 
+AT_CHECK([$HAVE_XML && $HAVE_PYTHON && ( cd $abs_srcdir/../bindings/python; $PYTHON nxstest.py -q xml | sed -e 's/\r$//' ) ],[], 
 [[]])
 AT_CLEANUP