Merge branch 'BR_MULTI_BATHS' into HEAD

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_Main.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index 4c6741aa320793c2086c21e830bb1d244f0ebc43..d50bdcf7831fcec5954238c6a03c7a52385c759b 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -30,6 +30,9 @@
 #include <QColor>
 #include <QTest>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 int main( int argc, char* argv[] )
 {
   QApplication anApp( argc, argv );
@@ -65,8 +68,8 @@ int main( int argc, char* argv[] )
     CppUnit::TestFactoryRegistry::getRegistry();
   // Add the top suite to the test runner
   TestLib_Runner runner;
-  //QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
-  //runner.Load( aPath.toStdString() );
+  QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
+  runner.Load( aPath.toStdString() );
   runner.addTest( registry.makeTest() );   
   try
   {
@@ -86,7 +89,11 @@ int main( int argc, char* argv[] )
       << std::endl;
     return 0;
   }
-
-  //anApp.exec();
+  bool isOK = result.wasSuccessful();
+  DEBTRACE("End of tests");
+  aWindow->close();
+  aSession.closeSession();
+  anApp.exit(!isOK);
+  DEBTRACE("--- TODO: exception on exit..."); // TODO: exception on exit...
   return result.wasSuccessful() ? 0 : 1;
 }