From a88e75918e045e29c049f0b17622ccb31b8f0b20 Mon Sep 17 00:00:00 2001 From: asl Date: Wed, 14 Dec 2016 08:55:19 +0300 Subject: [PATCH] refs #1092: patch for installation folders of test scripts and data --- doc/salome/examples/CMakeLists.txt | 5 +++-- src/HYDRO_tests/TestViewer.cxx | 4 ++-- src/HYDRO_tests/reference_data/CMakeLists.txt | 2 +- src/HYDRO_tests/test_HYDROData_CalcCase.cxx | 2 +- src/HYDRO_tests/test_HYDROData_ShapeFile.cxx | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 5c89302e..53ebb89e 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -58,8 +58,9 @@ SET(HYDRO_SAMPLES # Application tests -SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/HYDRO) -INSTALL(FILES ${EXAMPLES_TESTS} ${HYDRO_SAMPLES} DESTINATION ${TEST_INSTALL_DIRECTORY}) +SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test) +INSTALL(FILES ${EXAMPLES_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY}) +INSTALL(FILES ${HYDRO_SAMPLES} DESTINATION ${TEST_INSTALL_DIRECTORY}/HYDRO) INSTALL(FILES CTestTestfileInstall.cmake DESTINATION ${TEST_INSTALL_DIRECTORY} diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx index f48beeac..ab5e7744 100644 --- a/src/HYDRO_tests/TestViewer.cxx +++ b/src/HYDRO_tests/TestViewer.cxx @@ -278,7 +278,7 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons if( theCase ) myKey = theCase; - QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test"; + QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO"; anExpectedRefFilePath += "/" + myKey + ".png"; QImage anExpectedRefImage; anExpectedRefImage.load( anExpectedRefFilePath ); @@ -388,7 +388,7 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName, int theLinesToOmit, QString& theMsg ) { - QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test"; + QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO"; anExpectedRefFilePath += "/" + theBaseName; QString anActualFilePath = QDir::tempPath() + "/" + theBaseName; diff --git a/src/HYDRO_tests/reference_data/CMakeLists.txt b/src/HYDRO_tests/reference_data/CMakeLists.txt index d315e492..dedc104a 100644 --- a/src/HYDRO_tests/reference_data/CMakeLists.txt +++ b/src/HYDRO_tests/reference_data/CMakeLists.txt @@ -121,5 +121,5 @@ SET(REFERENCE_DATA # Application tests -SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_BINS}/test) +SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_BINS}/test/HYDRO) INSTALL(FILES ${REFERENCE_DATA} DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/src/HYDRO_tests/test_HYDROData_CalcCase.cxx b/src/HYDRO_tests/test_HYDROData_CalcCase.cxx index f0b327fb..1350b9aa 100644 --- a/src/HYDRO_tests/test_HYDROData_CalcCase.cxx +++ b/src/HYDRO_tests/test_HYDROData_CalcCase.cxx @@ -35,7 +35,7 @@ #include -QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test"; +QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO"; void test_HYDROData_CalcCase::test_add_int_wires() diff --git a/src/HYDRO_tests/test_HYDROData_ShapeFile.cxx b/src/HYDRO_tests/test_HYDROData_ShapeFile.cxx index 75281194..b4007cea 100644 --- a/src/HYDRO_tests/test_HYDROData_ShapeFile.cxx +++ b/src/HYDRO_tests/test_HYDROData_ShapeFile.cxx @@ -21,7 +21,7 @@ #include #include -const QString REF_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test"; +const QString REF_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO"; bool test_HYDROData_ShapeFile::compare_two_files(const QString& File1, const QString& File2) { -- 2.39.2