Veronika Vodeb / ctools

Commit ff3b8957409b339211e64d10eb2439558fa64fac

Authored by Jürgen Knödlseder
1 parent 25ca02b7

Cherry-pick same changes for release 1.2.1

Inline Side-by-side
Showing 6 changed files with 37 additions and 22 deletions
pyext/Makefile.am
  View file @ff3b895
... ... @@ -65,7 +65,9 @@ testdata = $(top_srcdir)/test/data/crab.xml \
65 65 $(top_srcdir)/test/data/crab_events.fits.gz \
66 66 $(top_srcdir)/test/data/crab_cntmap.fits.gz \
67 67 $(top_srcdir)/test/data/invalid_event_list.fits.gz \
68   - $(top_srcdir)/test/data/exclusion.reg
  68 + $(top_srcdir)/test/data/obs_unbinned.xml \
  69 + $(top_srcdir)/test/data/exclusion.reg \
  70 + $(top_srcdir)/test/data/irf_file.fits.gz
69 71  
70 72 # Install test scripts and test data. Note that we don't need to prepend
71 73 # $(DESTDIR) here (not fully clear why, but that's the way it is)
... ... @@ -119,6 +121,9 @@ EXTRA_DIST = ctools/tests \
119 121 $(testscripts) \
120 122 $(testdata) \
121 123 $(testirf)
  124 +dist-hook:
  125 + cp -r $(srcdir)/*.i $(distdir)
  126 + cp -r $(srcdir)/ctools/*.i $(distdir)/ctools
122 127  
123 128 # Dependencies. Obtain the list of dependencies by executing ls.
124 129 DEPFILES = $(shell ls *.Pi 2> /dev/null)
... ... @@ -161,6 +166,7 @@ uninstall-local:
161 166 rm -rf $(DESTDIR)$(pyexecdir)/ctools/tests/*.pyc
162 167 rm -rf $(DESTDIR)$(pyexecdir)/ctools/tests/__pycache__
163 168 rm -rf $(DESTDIR)$(pyexecdir)/ctools-@VERSION@*.egg-info
  169 + rm -rf $(DESTDIR)$(datarootdir)/ctools
164 170  
165 171 # Set files to be removed in 'make clean'
166 172 CLEANFILES = $(CLEAN_FILES) $(DEPFILES)
... ...
src/ctexpcube/main.cpp
  View file @ff3b895
... ... @@ -57,9 +57,6 @@ int main (int argc, char *argv[])
57 57 // Create instance of application
58 58 application = new ctexpcube(argc, argv);
59 59  
60   - // Execute application
61   - application->execute();
62   -
63 60 // Execute ctool
64 61 rc = execute_ctool(application);
65 62  
... ...
test/Makefile.am
  View file @ff3b895
... ... @@ -71,7 +71,15 @@ installcheck-local:
71 71 @export CTOOLS=$(DESTDIR)$(prefix); \
72 72 . $(DESTDIR)$(prefix)/bin/ctools-init.sh; \
73 73 python -c 'import ctools; ctools.test()'; \
74   - python -c 'import cscripts; cscripts.test()'
  74 + if test "x$$?" != "x0"; then \
  75 + echo "*** ctools unit test failure!"; \
  76 + exit 1; \
  77 + fi; \
  78 + python -c 'import cscripts; cscripts.test()'; \
  79 + if test "x$$?" != "x0"; then \
  80 + echo "*** cscripts unit test failure!"; \
  81 + exit 1; \
  82 + fi
75 83 endif
76 84  
77 85 # Add Valgrind rule
... ...
test/test_examples.py.in
  View file @ff3b895
... ... @@ -517,4 +517,6 @@ if __name__ == '__main__':
517 517 rc = 1
518 518  
519 519 # Exit with return code
520   - sys.exit(rc)
  520 + if not success:
  521 + raise RuntimeError('At least one error occured during the test.')
  522 + #sys.exit(rc)
... ...
test/test_python_cscripts.py
  View file @ff3b895
... ... @@ -164,26 +164,27 @@ def test(installed=False, debug=False):
164 164 # Run test suite
165 165 success = suites.run()
166 166  
167   - # If we have a non-installed version then save test results
  167 + # Save test results
168 168 if not installed:
169 169 suites.save('reports/cscripts.xml')
  170 + else:
  171 + suites.save('cscripts_reports.xml')
170 172  
171 173 # If debuging is requested then print test suites
172 174 if debug:
173 175 print(suites)
174 176  
175   - # Set return code
176   - if success:
177   - rc = 0
178   - else:
179   - rc = 1
180   -
181 177 # Remove temporary direction
182 178 if installed:
183 179 os.system('rm -rf %s' % (path))
184 180  
185 181 # Exit with return code
186   - sys.exit(rc)
  182 + if not success:
  183 + raise RuntimeError('At least one error occured during the test.')
  184 + #sys.exit(rc)
  185 +
  186 + # Return
  187 + return
187 188  
188 189  
189 190 # ======================== #
... ...
test/test_python_ctools.py
  View file @ff3b895
... ... @@ -129,22 +129,23 @@ def test(installed=False):
129 129 # Run test suite
130 130 success = suites.run()
131 131  
132   - # If we have a non-installed version then save test results
  132 + # Save test results
133 133 if not installed:
134 134 suites.save('reports/ctools.xml')
135   -
136   - # Set return code
137   - if success:
138   - rc = 0
139 135 else:
140   - rc = 1
  136 + suites.save('ctools_reports.xml')
141 137  
142 138 # Remove temporary direction
143 139 if installed:
144 140 os.system('rm -rf %s' % (path))
145 141  
146   - # Exit with return code
147   - sys.exit(rc)
  142 + # Throw an exception in case of failure
  143 + if not success:
  144 + raise RuntimeError('At least one error occured during the test.')
  145 + #sys.exit(rc)
  146 +
  147 + # Return
  148 + return
148 149  
149 150  
150 151 # ======================== #
... ...