From 77f13be7b454c1c3c724be9992323248765711ca Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 4 Oct 2015 23:22:32 +0200 Subject: [PATCH] don't clutter cmake with tests intended for appveyor only and increase the verbosity of this test to see what happens --- CMakeLists.txt | 10 +--------- appveyor.yml | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4176da3dff..72962690a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,15 +275,7 @@ endif() 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 diff --git a/appveyor.yml b/appveyor.yml index 65019e12e5..e4a89ae2c0 100644 --- 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 +- 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 -- 2.20.1