X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Main.cxx;h=6d6840931a0fb1fb2aa97ff79ce0b21f6227f172;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=15ea61a6bbbd1cb3b5d4a388a2045ec8110eb468;hpb=bb520df39e1197c77520619cc7def34cd6b9d2b6;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx index 15ea61a6..6d684093 100644 --- a/src/HYDRO_tests/test_HYDROData_Main.cxx +++ b/src/HYDRO_tests/test_HYDROData_Main.cxx @@ -30,14 +30,14 @@ #include #include -#define _DEVDEBUG_ +//#define _DEVDEBUG_ #include "HYDRO_trace.hxx" #ifdef WIN32 -QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO"; +QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO"; QString TMP_DIR = QDir::tempPath(); #else -QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO"; +QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO"; QString TMP_DIR = qgetenv( "HYDRO_ROOT_DIR" ) + "/test_ref"; #endif @@ -70,13 +70,13 @@ int main( int argc, char* argv[] ) // Add a listener that collects test result CppUnit::TestResultCollector result; - controller.addListener( &result ); + controller.addListener( &result ); // Add a listener that print dots as test run. TestLib_Listener progress; - controller.addListener( &progress ); + controller.addListener( &progress ); - CppUnit::TestFactoryRegistry& registry = + CppUnit::TestFactoryRegistry& registry = CppUnit::TestFactoryRegistry::getRegistry(); // Add the top suite to the test runner TestLib_Runner runner; @@ -86,7 +86,7 @@ int main( int argc, char* argv[] ) QString aPath = qgetenv( "HYDRO_ROOT_DIR" ) + "/tests.cfg"; #endif runner.Load( aPath.toStdString() ); - runner.addTest( registry.makeTest() ); + runner.addTest( registry.makeTest() ); try { std::cout << "Running tests " << testPath << "..." << std::endl; @@ -100,7 +100,7 @@ int main( int argc, char* argv[] ) } catch ( std::invalid_argument &e ) // Test path not resolved { - std::cerr << std::endl + std::cerr << std::endl << "ERROR: " << e.what() << std::endl; return 0;