From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 2 Oct 2015 13:51:42 +0000 (+0200)
Subject: [windows] try to do a very basic test of java, without tesh
X-Git-Tag: v3_12~57
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ba7076c5f72d5b7cec9b0a88cb7d45fa5f62996a

[windows] try to do a very basic test of java, without tesh
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b07a5e5908..2c59a3b210 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,7 +273,17 @@ if(enable_memcheck_xml)
   set(enable_memcheck true)
 endif()
 
-include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake)
+INCLUDE(CTest)
+ENABLE_TESTING()
+if(WIN32)
+  add_test(
+      NAME basic-java
+      COMMAND java -cp ${CMAKE_HOME_DIRECTORY}\\simgrid.jar;. masterslave/Masterslave ..\\platforms\\platform.xml masterslave\\masterslaveDeployment.xml
+      WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}\\examples\\java
+  )
+else()
+  include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake)
+endif()
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
 ### Setup the distrib
diff --git a/tools/cmake/AddTests.cmake b/tools/cmake/AddTests.cmake
index 062f3369f6..a824bfff9c 100644
--- a/tools/cmake/AddTests.cmake
+++ b/tools/cmake/AddTests.cmake
@@ -59,9 +59,6 @@ MACRO(ADD_TESH_FACTORIES NAME FACTORIES)
   ENDFOREACH()
 ENDMACRO()
 
-INCLUDE(CTest)
-ENABLE_TESTING()
-
 IF(NOT enable_memcheck)
   ## CORE ##
   ### TESH ###