From 8619d782a43f6e937eaeee331e493de882550f85 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 29 Nov 2014 11:53:58 +0100 Subject: [PATCH] put together the java-based tests --- buildtools/Cmake/AddTests.cmake | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 1343003f49..ca00be294a 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -84,16 +84,6 @@ IF(NOT enable_memcheck) ADD_TESH(tesh-self-catch-signal --cd "${CMAKE_BINARY_DIR}/bin" ${CMAKE_HOME_DIRECTORY}/tools/tesh/catch-signal.tesh) ENDIF() -IF(enable_java) - IF(WIN32) - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/teshsuite/java/\;${SIMGRID_FULL_JAR}") - STRING(REPLACE "\;" "§" TESH_CLASSPATH "${TESH_CLASSPATH}") - ELSE() - SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/teshsuite/java/:${SIMGRID_FULL_JAR}") - ENDIF() - ADD_TESH(tesh-java-sleep-host-off --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleep_host_off/sleep_host_off.tesh) -ENDIF() - ### GENERIC ### # BEGIN TESH TESTS # test for code coverage @@ -552,6 +542,9 @@ ENDIF() IF(HAVE_TRACING) ADD_TESH(java-tracing --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/tracing/tracingPingPong.tesh) ENDIF() + + # teshsuite ones + ADD_TESH(tesh-java-sleep-host-off --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleep_host_off/sleep_host_off.tesh) ENDIF() -- 2.20.1