Cherry-pick same changes for release 1.2.1

Jürgen Knödlseder
1 parent 25ca02b7
Showing 6 changed files with 37 additions and 22 deletions
pyext/Makefile.am
src/ctexpcube/main.cpp
test/Makefile.am
test/test_examples.py.in
test/test_python_cscripts.py
test/test_python_ctools.py
@@ -65,7 +65,9 @@ testdata = $(top_srcdir)/test/data/crab.xml \
            $(top_srcdir)/test/data/crab_events.fits.gz \
            $(top_srcdir)/test/data/crab_cntmap.fits.gz \
            $(top_srcdir)/test/data/invalid_event_list.fits.gz \
-           $(top_srcdir)/test/data/exclusion.reg
+           $(top_srcdir)/test/data/obs_unbinned.xml \
+           $(top_srcdir)/test/data/exclusion.reg \
+           $(top_srcdir)/test/data/irf_file.fits.gz
 # Install test scripts and test data. Note that we don't need to prepend
 # $(DESTDIR) here (not fully clear why, but that's the way it is)
@@ -119,6 +121,9 @@ EXTRA_DIST = ctools/tests \
              $(testscripts) \
              $(testdata) \
              $(testirf)
+dist-hook:
+	cp -r $(srcdir)/*.i $(distdir)
+	cp -r $(srcdir)/ctools/*.i $(distdir)/ctools
 # Dependencies. Obtain the list of dependencies by executing ls.
 DEPFILES = $(shell ls *.Pi 2> /dev/null)
@@ -161,6 +166,7 @@ uninstall-local:
 	rm -rf $(DESTDIR)$(pyexecdir)/ctools/tests/*.pyc
 	rm -rf $(DESTDIR)$(pyexecdir)/ctools/tests/__pycache__
 	rm -rf $(DESTDIR)$(pyexecdir)/ctools-@VERSION@*.egg-info
+	rm -rf $(DESTDIR)$(datarootdir)/ctools
 # Set files to be removed in 'make clean'
 CLEANFILES = $(CLEAN_FILES) $(DEPFILES)
@@ -57,9 +57,6 @@ int main (int argc, char *argv[])
         // Create instance of application
         application = new ctexpcube(argc, argv);
-        // Execute application
-        application->execute();
-
         // Execute ctool
         rc = execute_ctool(application);
@@ -71,7 +71,15 @@ installcheck-local:
 	@export CTOOLS=$(DESTDIR)$(prefix); \
 	. $(DESTDIR)$(prefix)/bin/ctools-init.sh; \
 	python -c 'import ctools; ctools.test()'; \
-	python -c 'import cscripts; cscripts.test()'
+	if test "x$$?" != "x0"; then \
+		echo "*** ctools unit test failure!"; \
+		exit 1; \
+	fi; \
+	python -c 'import cscripts; cscripts.test()'; \
+	if test "x$$?" != "x0"; then \
+		echo "*** cscripts unit test failure!"; \
+		exit 1; \
+	fi
 endif
 # Add Valgrind rule
@@ -517,4 +517,6 @@ if __name__ == &#39;__main__&#39;:
         rc = 1
     # Exit with return code
-    sys.exit(rc)
+    if not success:
+        raise RuntimeError('At least one error occured during the test.')
+    #sys.exit(rc)
@@ -164,26 +164,27 @@ def test(installed=False, debug=False):
     # Run test suite
     success = suites.run()
-    # If we have a non-installed version then save test results
+    # Save test results
     if not installed:
         suites.save('reports/cscripts.xml')
+    else:
+        suites.save('cscripts_reports.xml')
     # If debuging is requested then print test suites
     if debug:
         print(suites)
-    # Set return code
-    if success:
-        rc = 0
-    else:
-        rc = 1
-
     # Remove temporary direction
     if installed:
         os.system('rm -rf %s' % (path))
     # Exit with return code
-    sys.exit(rc)
+    if not success:
+        raise RuntimeError('At least one error occured during the test.')
+    #sys.exit(rc)
+
+    # Return
+    return
 # ======================== #
@@ -129,22 +129,23 @@ def test(installed=False):
     # Run test suite
     success = suites.run()
-    # If we have a non-installed version then save test results
+    # Save test results
     if not installed:
         suites.save('reports/ctools.xml')
-
-    # Set return code
-    if success:
-        rc = 0
     else:
-        rc = 1
+        suites.save('ctools_reports.xml')
     # Remove temporary direction
     if installed:
         os.system('rm -rf %s' % (path))
-    # Exit with return code
-    sys.exit(rc)
+    # Throw an exception in case of failure
+    if not success:
+        raise RuntimeError('At least one error occured during the test.')
+    #sys.exit(rc)
+
+    # Return
+    return
 # ======================== #