Jürgen Knödlseder / gammalib

Commit dea67fa561b44f672442d8a85f4adaefa6e47a29

Authored by Jürgen Knödlseder
1 parent e598adfa

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.
Inline Side-by-side
Showing 1 changed file with 17 additions and 7 deletions
test/Makefile.am
  View file @dea67fa
... ... @@ -8,6 +8,7 @@
8 8 if WITH_INST_MWL
9 9 INST_MWL = test_MWL
10 10 INCL_MWL = -I$(top_srcdir)/inst/mwl/include
  11 + TEST_MWL = :$(top_srcdir)/inst/mwl/test
11 12 test_MWL_SOURCES = $(top_srcdir)/inst/mwl/test/test_MWL.cpp
12 13 test_MWL_LDFLAGS = @LDFLAGS@
13 14 test_MWL_CPPFLAGS = @CPPFLAGS@
... ... @@ -16,6 +17,7 @@ endif
16 17 if WITH_INST_CTA
17 18 INST_CTA = test_CTA
18 19 INCL_CTA = -I$(top_srcdir)/inst/cta/include
  20 + TEST_CTA = :$(top_srcdir)/inst/cta/test
19 21 test_CTA_SOURCES = $(top_srcdir)/inst/cta/test/test_CTA.cpp
20 22 test_CTA_LDFLAGS = @LDFLAGS@
21 23 test_CTA_CPPFLAGS = @CPPFLAGS@
... ... @@ -24,6 +26,7 @@ endif
24 26 if WITH_INST_LAT
25 27 INST_LAT = test_LAT
26 28 INCL_LAT = -I$(top_srcdir)/inst/lat/include
  29 + TEST_LAT = :$(top_srcdir)/inst/lat/test
27 30 test_LAT_SOURCES = $(top_srcdir)/inst/lat/test/test_LAT.cpp
28 31 test_LAT_LDFLAGS = @LDFLAGS@
29 32 test_LAT_CPPFLAGS = @CPPFLAGS@
... ... @@ -33,7 +36,7 @@ endif
33 36 # Optional python bindings
34 37 if WITH_PYTHON
35 38 TEST_PYTHON_SCRIPT = test_python.py
36   - TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext:$(PYTHONPATH)
  39 + TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext$(TEST_MWL)$(TEST_CTA)$(TEST_LAT):$(PYTHONPATH)
37 40 endif
38 41  
39 42 # Darwin support
... ... @@ -60,7 +63,8 @@ check_PROGRAMS = test_GSupport \
60 63 test_GApplication \
61 64 test_GModel \
62 65 test_GSky \
63   - test_GObservations \
  66 + test_GOptimizer \
  67 + test_GObservation \
64 68 $(INST_MWL) $(INST_CTA) $(INST_LAT)
65 69  
66 70 # Set test environment (needed for linking with cfitsio and readline)
... ... @@ -79,7 +83,8 @@ TESTS = test_GSupport \
79 83 test_GApplication \
80 84 test_GModel \
81 85 test_GSky \
82   - test_GObservations \
  86 + test_GOptimizer \
  87 + test_GObservation \
83 88 $(INST_MWL) $(INST_CTA) $(INST_LAT) \
84 89 $(TEST_PYTHON_SCRIPT)
85 90  
... ... @@ -139,10 +144,15 @@ test_GSky_LDFLAGS = @LDFLAGS@
139 144 test_GSky_CPPFLAGS = @CPPFLAGS@
140 145 test_GSky_LDADD = $(top_srcdir)/src/libgamma.la
141 146 #
142   -test_GObservations_SOURCES = test_GObservations.cpp
143   -test_GObservations_LDFLAGS = @LDFLAGS@
144   -test_GObservations_CPPFLAGS = @CPPFLAGS@
145   -test_GObservations_LDADD = $(top_srcdir)/src/libgamma.la
  147 +test_GOptimizer_SOURCES = test_GOptimizer.cpp
  148 +test_GOptimizer_LDFLAGS = @LDFLAGS@
  149 +test_GOptimizer_CPPFLAGS = @CPPFLAGS@
  150 +test_GOptimizer_LDADD = $(top_srcdir)/src/libgamma.la
  151 +#
  152 +test_GObservation_SOURCES = test_GObservation.cpp
  153 +test_GObservation_LDFLAGS = @LDFLAGS@
  154 +test_GObservation_CPPFLAGS = @CPPFLAGS@
  155 +test_GObservation_LDADD = $(top_srcdir)/src/libgamma.la
146 156  
147 157 # Add Valgrind rule
148 158 valgrind:
... ...