From: vsr <vsr@opencascade.com>
Date: Mon, 6 Jun 2016 08:14:03 +0000 (+0300)
Subject: Merge branch 'V7_dev'
X-Git-Tag: V8_1_0a1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0dda5bf24dc8c1a57fc668a98576de03a0087d8b;p=modules%2Fkernel.git

Merge branch 'V7_dev'
.cmake
---

0dda5bf24dc8c1a57fc668a98576de03a0087d8b
diff --cc src/SALOMEDS/Test/CTestTestfileInstall.cmake
index 941b3e081,6369be80f..e772b0810
--- a/src/SALOMEDS/Test/CTestTestfileInstall.cmake
+++ b/src/SALOMEDS/Test/CTestTestfileInstall.cmake
@@@ -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()