From f741dad0926a35b69c285129f86e6b8200b3ef73 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 27 May 2014 16:59:28 +0200 Subject: [PATCH] Gory hack to correclty set classpath for tests on Windows. --- buildtools/Cmake/AddTests.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index f57e826fab..ba3a113029 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -38,6 +38,9 @@ ENDIF() MACRO(ADD_TESH NAME) SET(ARGR ${ARGV}) LIST(REMOVE_AT ARGR 0) + IF(WIN32) + STRING(REGEX REPLACE "(classpath=[^ ]*):" "\\1\\\;" ARGR "${ARGR}") + ENDIF() ADD_TEST(${NAME} ${TESH_COMMAND} ${TESH_OPTION} ${ARGR}) ENDMACRO() @@ -473,11 +476,7 @@ IF(NOT enable_memcheck) ### JAVA ### IF(enable_java) - IF(WIN32) - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/\;${SIMGRID_FULL_JAR}") - ELSE() - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${SIMGRID_FULL_JAR}") - ENDIF() + SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/java/:${SIMGRID_FULL_JAR}") ADD_TESH(java-async --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/async/async.tesh) ADD_TESH(java-bittorrent --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/bittorrent/bittorrent.tesh) ADD_TESH(java-bypass --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/master_slave_bypass/bypass.tesh) -- 2.20.1