Commit 786941d72726604bbbf3f26e226301da73162010
1 parent
55509ac5
Add wrapper library directory to PYTHONPATH.
A symbolic link is now created by setup.py that points towards the wrapper library directory. We add this directory now to the PYTHONPATH so that no double compilation is needed anymore.
Showing
1 changed file
with
1 additions
and
2 deletions
test/Makefile.am
| @@ -8,11 +8,10 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ | @@ -8,11 +8,10 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ | ||
| 8 | if WITH_PYTHON | 8 | if WITH_PYTHON |
| 9 | TEST_CSCRIPTS = test_cscripts.sh | 9 | TEST_CSCRIPTS = test_cscripts.sh |
| 10 | TEST_PYTHON_SCRIPT = test_python.py | 10 | TEST_PYTHON_SCRIPT = test_python.py |
| 11 | - TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH) | 11 | + TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH) |
| 12 | endif | 12 | endif |
| 13 | 13 | ||
| 14 | # Set test environment | 14 | # Set test environment |
| 15 | -#TESTS_ENVIRONMENT = $(TEST_PYTHON_ENV) | ||
| 16 | TESTS_ENVIRONMENT = @RUNSHARED@=$(top_builddir)/src/.libs$(TEST_ENV_DIR):$(LIBDIR_GAMMALIB):$(@RUNSHARED@) \ | 15 | TESTS_ENVIRONMENT = @RUNSHARED@=$(top_builddir)/src/.libs$(TEST_ENV_DIR):$(LIBDIR_GAMMALIB):$(@RUNSHARED@) \ |
| 17 | $(TEST_PYTHON_ENV) | 16 | $(TEST_PYTHON_ENV) |
| 18 | 17 |