[MEDCalc] test script must exit with actual unittest runner status

diff --git a/src/MEDCalc/test/gui/CMakeLists.txt b/src/MEDCalc/test/gui/CMakeLists.txt
index cb6df7349e0ddac53011cc54716c329e7f4e6839..188391e28ff4d97e72d831e1ead6906d6c98022b 100644 (file)
--- a/src/MEDCalc/test/gui/CMakeLists.txt
+++ b/src/MEDCalc/test/gui/CMakeLists.txt
@@ -41,7 +41,7 @@ SET(TEST_INSTALL_DIRECTORY ${SALOME_MED_INSTALL_TEST}/MEDCalc/gui)
 SALOME_INSTALL_SCRIPTS(test_qttesting.py ${TEST_INSTALL_DIRECTORY})
 SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/medcalc_testutils.py ${TEST_INSTALL_DIRECTORY})
 
-SALOME_INSTALL_SCRIPTS("${_test_scripts}" ${SALOME_INSTALL_PYTHON}/tests)
+SALOME_INSTALL_SCRIPTS("${_test_scripts}" ${SALOME_INSTALL_PYTHON}/tests/gui)
 
 INSTALL(FILES ${_test_scenarii} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/tests/gui/scenarios)
 INSTALL(FILES ${_test_baselines} DESTINATION ${SALOME_MED_INSTALL_RES_DATA}/tests/gui/baselines)

diff --git a/src/MEDCalc/test/gui/medcalc_testutils.py.in b/src/MEDCalc/test/gui/medcalc_testutils.py.in
index bcdf7f9a38c5865dc9acc776b1363e2a85e15daf..0b50e06c52d1508df3d207e574bba31708a8a482 100644 (file)
--- a/src/MEDCalc/test/gui/medcalc_testutils.py.in
+++ b/src/MEDCalc/test/gui/medcalc_testutils.py.in
@@ -24,7 +24,7 @@ def __getRootDir():
   return rootDir
 
 def GetScriptDir():
-  relativeDir = "@SALOME_INSTALL_PYTHON@/tests"
+  relativeDir = "@SALOME_INSTALL_PYTHON@/tests/gui"
   return os.path.join(__getRootDir(), relativeDir)
 
 def GetScenarioDir():

diff --git a/src/MEDCalc/test/gui/test_qttesting.py b/src/MEDCalc/test/gui/test_qttesting.py
index e059b853bddeafe048c58892f7d5c5cfc694aebf..1983febb95254cea107d6096a1d98f4e521f45fb 100644 (file)
--- a/src/MEDCalc/test/gui/test_qttesting.py
+++ b/src/MEDCalc/test/gui/test_qttesting.py
@@ -18,7 +18,7 @@
 #
 # Author: A. Bruneton (CEA)
 
-import unittest, os, shutil
+import unittest, os, shutil, sys
 from posixpath import basename
 
 class MEDGUITest(unittest.TestCase):
@@ -117,5 +117,7 @@ if __name__ == "__main__":
   suite.addTest(MEDGUITest('testScalarMap'))
   suite.addTest(MEDGUITest('testScalarMap2'))
 #  suite.addTest(MEDGUITest('testIsoContour'))
-  unittest.TextTestRunner().run(suite)
 
+  runner = unittest.TextTestRunner()
+  ret = not runner.run(suite).wasSuccessful()
+  sys.exit(ret)