Add instrument and optimizer tests.

Add the Python paths to the instrument test directories so that the test script can import the instrument test scripts. Add GOptimizer test to the test suites.

Add instrument and optimizer tests.
Add the Python paths to the instrument test directories so that the test script can import the instrument test scripts. Add GOptimizer test to the test suites.
Jürgen Knödlseder
1 parent e598adfa
Showing 1 changed file with 17 additions and 7 deletions
test/Makefile.am
@@ -8,6 +8,7 @@
 if WITH_INST_MWL
   INST_MWL = test_MWL
   INCL_MWL = -I$(top_srcdir)/inst/mwl/include
+  TEST_MWL = :$(top_srcdir)/inst/mwl/test
   test_MWL_SOURCES = $(top_srcdir)/inst/mwl/test/test_MWL.cpp
   test_MWL_LDFLAGS = @LDFLAGS@
   test_MWL_CPPFLAGS = @CPPFLAGS@
@@ -16,6 +17,7 @@ endif
 if WITH_INST_CTA
   INST_CTA = test_CTA
   INCL_CTA = -I$(top_srcdir)/inst/cta/include
+  TEST_CTA = :$(top_srcdir)/inst/cta/test
   test_CTA_SOURCES = $(top_srcdir)/inst/cta/test/test_CTA.cpp
   test_CTA_LDFLAGS = @LDFLAGS@
   test_CTA_CPPFLAGS = @CPPFLAGS@
@@ -24,6 +26,7 @@ endif
 if WITH_INST_LAT
   INST_LAT = test_LAT
   INCL_LAT = -I$(top_srcdir)/inst/lat/include
+  TEST_LAT = :$(top_srcdir)/inst/lat/test
   test_LAT_SOURCES = $(top_srcdir)/inst/lat/test/test_LAT.cpp
   test_LAT_LDFLAGS = @LDFLAGS@
   test_LAT_CPPFLAGS = @CPPFLAGS@
@@ -33,7 +36,7 @@ endif
 # Optional python bindings
 if WITH_PYTHON
   TEST_PYTHON_SCRIPT = test_python.py
-  TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext:$(PYTHONPATH)
+  TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext$(TEST_MWL)$(TEST_CTA)$(TEST_LAT):$(PYTHONPATH)
 endif
 # Darwin support
@@ -60,7 +63,8 @@ check_PROGRAMS = test_GSupport \
                  test_GApplication \
                  test_GModel \
                  test_GSky \
-                 test_GObservations \
+                 test_GOptimizer \
+                 test_GObservation \
                  $(INST_MWL) $(INST_CTA) $(INST_LAT)
 # Set test environment (needed for linking with cfitsio and readline)
@@ -79,7 +83,8 @@ TESTS = test_GSupport \
         test_GApplication \
         test_GModel \
         test_GSky \
-        test_GObservations \
+        test_GOptimizer \
+        test_GObservation \
         $(INST_MWL) $(INST_CTA) $(INST_LAT) \
         $(TEST_PYTHON_SCRIPT)
@@ -139,10 +144,15 @@ test_GSky_LDFLAGS = @LDFLAGS@
 test_GSky_CPPFLAGS = @CPPFLAGS@
 test_GSky_LDADD = $(top_srcdir)/src/libgamma.la
 #
-test_GObservations_SOURCES = test_GObservations.cpp
-test_GObservations_LDFLAGS = @LDFLAGS@
-test_GObservations_CPPFLAGS = @CPPFLAGS@
-test_GObservations_LDADD = $(top_srcdir)/src/libgamma.la
+test_GOptimizer_SOURCES = test_GOptimizer.cpp
+test_GOptimizer_LDFLAGS = @LDFLAGS@
+test_GOptimizer_CPPFLAGS = @CPPFLAGS@
+test_GOptimizer_LDADD = $(top_srcdir)/src/libgamma.la
+#
+test_GObservation_SOURCES = test_GObservation.cpp
+test_GObservation_LDFLAGS = @LDFLAGS@
+test_GObservation_CPPFLAGS = @CPPFLAGS@
+test_GObservation_LDADD = $(top_srcdir)/src/libgamma.la
 # Add Valgrind rule
 valgrind: