Merge V8_4_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f23f76faf749d12fa1e8a571e4da5a800d5b41b1..4a9cad35258f2497fefe56a675f1e20d163f09ee 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/py2yacs/Test/CMakeLists.txt b/src/py2yacs/Test/CMakeLists.txt
index ad8303cf826700a7c2e3ee90260e3aeeb1fc7572..0bdf81a4a0ccb6f8f2b37201d37de63e741ffef1 100644 (file)
--- a/src/py2yacs/Test/CMakeLists.txt
+++ b/src/py2yacs/Test/CMakeLists.txt
@@ -41,10 +41,12 @@ TARGET_LINK_LIBRARIES(test_py2yacs py2yacslib)
 
 # For salome test
 IF(NOT WIN32)
-  ADD_TEST(TestPy2yacs TestPy2yacs)
-  SET_TESTS_PROPERTIES(TestPy2yacs PROPERTIES
-                       ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/..:$ENV{PYTHONPATH}"
-                      )
+  # This test needs a running salome session
+  # TODO: Run the test in a salome session
+  #ADD_TEST(TestPy2yacs TestPy2yacs)
+  #SET_TESTS_PROPERTIES(TestPy2yacs PROPERTIES
+  #                     ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/..:$ENV{PYTHONPATH}"
+  #                    )
 
   SET(LOCAL_TEST_DIR ${SALOME_YACS_INSTALL_TEST}/py2yacs)
   SET(LOCAL_TEST_FILES

diff --git a/src/py2yacs/Test/CTestTestfileInstall.cmake b/src/py2yacs/Test/CTestTestfileInstall.cmake
index a98d11d52c43dd0592560a06d600296aace03dbf..c4f58c00ce53356dd46d33033ec04dec238d3862 100644 (file)
--- a/src/py2yacs/Test/CTestTestfileInstall.cmake
+++ b/src/py2yacs/Test/CTestTestfileInstall.cmake
@@ -19,9 +19,8 @@
 
 IF(NOT WIN32)
   SET(TEST_NAME ${COMPONENT_NAME}_Py2YacsTest)
-  # No need of a salome session for this test
+  # Need a salome session for this test
   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ./TestPy2yacs)
-  #ADD_TEST(${TEST_NAME} TestPy2yacs)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
                                     LABELS "${COMPONENT_NAME}"
                       )