don't clutter cmake with tests intended for appveyor only

and increase the verbosity of this test to see what happens

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4176da3..7296269 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,15 +275,7 @@ endif()
 
 INCLUDE(CTest)
 ENABLE_TESTING()
 
 INCLUDE(CTest)
 ENABLE_TESTING()

-if(WIN32)
-  add_test(
-      NAME basic-java
-      COMMAND java -classpath ".;${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/AddTests.cmake)

 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
 ### Setup the distrib
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake)
 
 ### Setup the distrib

diff --git a/appveyor.yml b/appveyor.yml
index 65019e1..e4a89ae 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,9 +43,10 @@ build_script:
 - if not [%COMPILER%]==[MSVC15]                      cmake -G "MinGW Makefiles"             -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
 - if [%COMPILER%]==[MSVC15]     msbuild ALL_BUILD.vcxproj /verbosity:normal
 - if not [%COMPILER%]==[MSVC15] mingw32-make
 - if not [%COMPILER%]==[MSVC15]                      cmake -G "MinGW Makefiles"             -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
 - if [%COMPILER%]==[MSVC15]     msbuild ALL_BUILD.vcxproj /verbosity:normal
 - if not [%COMPILER%]==[MSVC15] mingw32-make

+- cd examples/java ; java -classpath ".;../../simgrid.jar" masterslave.Masterslave ../platforms/platform.xml masterslave/masterslaveDeployment.xml --log=root.thres:verbose --log=xbt.thres:info || true

 
 

-test_script:
-- ctest --verbose || true
+#test_script:
+#- ctest --verbose || true

 
 artifacts:
 - path: simgrid.jar
 
 artifacts:
 - path: simgrid.jar