Merge branch 'devel' of https://cta-gitlab.irap.omp.eu/ctools/ctools into 1807-s…

…how_obs-example-script

Merge branch 'devel' of https://cta-gitlab.irap.omp.eu/ctools/ctools into 1807-s…
…how_obs-example-script
Michael Mayer
2 parents ae1d935c cc5e351c
Showing 7 changed files with 14 additions and 43 deletions
.gitignore
configure.ac
examples/generate_prod3_irfs.py
sonar-project.properties
test/Makefile.am
test/test_examples.py → test/test_examples.py.in
test/test_examples.sh.in
@@ -83,7 +83,7 @@ test/*.trs
 test/*.txt
 test/*.eps
 test/test_cscripts.sh
-test/test_examples.sh
+test/test_examples.py
 test/reports/*.xml
 test/butterfly.txt
 test/.coverage
@@ -1025,7 +1025,7 @@ AC_CONFIG_FILES([Makefile
                  test/test_cscripts.sh
                  test/test_python_ctools.sh
                  test/test_python_cscripts.sh
-                 test/test_examples.sh
+                 test/test_examples.py
                  pyext/Makefile
                  pyext/setup.py
                  pyext/ctools/__init__.py
@@ -1039,7 +1039,7 @@ AC_CONFIG_FILES([Makefile
                 [if test -f test/test_cscripts.sh; then chmod +x test/test_cscripts.sh; fi;
                  if test -f test/test_python_ctools.sh; then chmod +x test/test_python_ctools.sh; fi;
                  if test -f test/test_python_cscripts.sh; then chmod +x test/test_python_cscripts.sh; fi;
-                 if test -f test/test_examples.sh; then chmod +x test/test_examples.sh; fi;
+                 if test -f test/test_examples.py; then chmod +x test/test_examples.py; fi;
                  if test -f testconf.sh; then chmod +x testconf.sh; fi])
 AC_OUTPUT
@@ -69,31 +69,31 @@ if __name__ == &#39;__main__&#39;:
     for entry in entries:
         # Set optional attributes
-        if entry.has_key('rebin'):
+        if 'rebin' in entry:
             rebin = entry['rebin']
         else:
             rebin = False
-        if entry.has_key('eascale'):
+        if 'eascale' in entry:
             eascale = entry['eascale']
         else:
             eascale = 1.0
-        if entry.has_key('bgdscale'):
+        if 'bgdscale' in entry:
             bgdscale = entry['bgdscale']
         else:
             bgdscale = 1.0
-        if entry.has_key('bgdethres'):
+        if 'bgdethres' in entry:
             bgdethres = entry['bgdethres']
         else:
             bgdethres = 1000.0
-        if entry.has_key('bgdinfill'):
+        if 'bgdinfill' in entry:
             bgdinfill = entry['bgdinfill']
         else:
             bgdinfill = False
-        if entry.has_key('oversample'):
+        if 'oversample' in entry:
             oversample = entry['oversample']
         else:
             oversample = 1
-        if entry.has_key('norm1d'):
+        if 'norm1d' in entry:
             norm1d = entry['norm1d']
         else:
             norm1d = False
@@ -15,17 +15,13 @@ sonar.links.scm=https://cta-gitlab.irap.omp.eu/ctools/ctools
 # Path to source directories
 sonar.sources=.
-# Path to tests
-#sonar.tests=test
-
 # Path to include directories
 sonar.cxx.includeDirectories=pyext,/home/jenkins/gcc/gcc492/include/c++/4.9.2,/home/jenkins/gcc/gcc492/include/c++/4.9.2/tr1,/home/jenkins/gcc/gcc492/include/c++/4.9.2/ext,/home/jenkins/gcc/gcc492/include/c++/4.9.2/x86_64-unknown-linux-gnu,/home/jenkins/gcc/gcc492/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/include,/usr/include,/usr/include/bits,/usr/include/gnu,/usr/include/linux
 sonar.cxx.missingIncludeWarnings=False
 # Exclusions
-sonar.exclusions=pyext/ctools/**,pyext/build/**,pyext/setup.py,doc/**,test/dev/**
-sonar.coverage.exclusions=pyext/ctools/**,pyext/build/**,examples/**,doc/**,test/dev/**
-#sonar.test.exclusions=
+sonar.exclusions=cscripts/tests/**,pyext/build/**,pyext/ctools/*_wrap.cpp,pyext/ctools/tests/**,doc/**,test/dev/**
+sonar.coverage.exclusions=test/science_verification.py,test/test_examples.py
 # C++ configuration
 sonar.cxx.cppcheck.reportPath=cppcheck-result.xml
@@ -9,7 +9,7 @@ if WITH_PYTHON
   TEST_CSCRIPTS        = test_cscripts.sh
   TEST_PYTHON_CTOOLS   = test_python_ctools.sh
   TEST_PYTHON_CSCRIPTS = test_python_cscripts.sh
-  TEST_PYTHON_EXAMPLES = test_examples.sh
+  TEST_PYTHON_EXAMPLES = test_examples.py
   TEST_PYTHON_ENV      = PYTHONPATH=$(top_builddir):$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(pythondir):$(pyexecdir):$(PYTHONPATH)
 endif
@@ -58,7 +58,7 @@ class Test(gammalib.GPythonTestSuite):
             String with name to be used for logging
         """
         # Setup command
-        cmd = '../examples/' + name + '.py'
+        cmd = '@PYTHON_COVERAGE@../examples/' + name + '.py'
         if len(args) > 0:
             cmd += ' ' + args
-#! /bin/sh
-# ==========================================================================
-# This script launches the examples unit tests
-#
-# Copyright (C) 2016 Juergen Knoedlseder
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# ==========================================================================
-
-#
-# Run the examples test
-# =====================
-@PYTHON_COVERAGE@./test_examples.py