Merge branch 'V7_dev'

.cmake

diff --combined bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
index eb69a0d20f42eb7fc1edc6c6832d2a4b965622ea,adb7930542fe411c009710915fa0986d9f1d9e50..51edf3ce16fe9b7f18057a11a2371020065ed52f
--- 1/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
--- 2/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
+++ b/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 +# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public
@@@ -19,11 -19,11 +19,11 @@@
  
  SET(TEST_NAMES
    TestLauncherSimple
-   TestLauncherSessionArgs
+ #  TestLauncherSessionArgs
    )
  
  FOREACH(tfile ${TEST_NAMES})
 -  SET(TEST_NAME SALOME_COMMAND_${tfile})
 +  SET(TEST_NAME ${COMPONENT_NAME}_SALOME_COMMAND_${tfile})
    ADD_TEST(${TEST_NAME} python ${tfile}.py)
 -  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 +  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
  ENDFOREACH()

diff --combined src/SALOMEDS/Test/CTestTestfileInstall.cmake
index 941b3e081188e7f2c7e0fdabf64a6daf4a8c0994,6369be80f2b0e0ebc6cd64a1aa7612bdcfafff6f..e772b08107ceab61bef9039156e4bde8f0c5c84a
--- 1/src/SALOMEDS/Test/CTestTestfileInstall.cmake
--- 2/src/SALOMEDS/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMEDS/Test/CTestTestfileInstall.cmake
@@@ -1,4 -1,4 +1,4 @@@
 -# Copyright (C) 2015-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 +# Copyright (C) 2015-2016  CEA/DEN, EDF R&D
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public
@@@ -17,11 -17,10 +17,11 @@@
  # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
  
- IF(NOT WIN32)
-   SET(TEST_NAME ${COMPONENT_NAME}_SALOMEDS)
-   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDS.py)
-   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
-                                     LABELS "${COMPONENT_NAME}"
-                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
-                       )
- ENDIF()
+ # IF(NOT WIN32)
 -#   ADD_TEST(SALOMEDS python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDS.py)
 -#   SET_TESTS_PROPERTIES(SALOMEDS PROPERTIES
 -#                                      LABELS "${COMPONENT_NAME}"
 -#                                      ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
++#   SET(TEST_NAME ${COMPONENT_NAME}_SALOMEDS)
++#   ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestSALOMEDS.py)
++#   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
++#                                     LABELS "${COMPONENT_NAME}"
++#                                     ENVIRONMENT "LD_LIBRARY_PATH=${KERNEL_TEST_LIB}:$ENV{LD_LIBRARY_PATH}"
+ #                       )
+ # ENDIF()