Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 365255d0 authored by hhakim's avatar hhakim
Browse files

Update nightly test jobs.

win7 VM has been abandoned (win10 only is used now but the nightly tests is disabled until the CDashScript is fixed for windows), linux job re-enabled.
parent e64048e8
Branches
Tags
No related merge requests found
......@@ -45,11 +45,11 @@ ctest_matlab:
.ctest_nightly: &ctest_nightly_script
<<: *ctest_script
variables: {BUILD_WRAPPER_MATLAB: "ON", BUILD_WRAPPER_PYTHON: "ON", SLOW_TESTS: "ON", DONT_PYPLOT_FAUST_TIME: "ON", NOPY2: "ON"}
variables: {BUILD_WRAPPER_MATLAB: "ON", BUILD_WRAPPER_PYTHON: "ON", SLOW_TESTS: "ON", DONT_PYPLOT_FAUST_TIME: "ON", NOPY2: "ON", BUILD_MULTITHREAD: "ON"}
only:
- schedules
.ctest_nightly_linux:
ctest_nightly_linux:
<<: *ctest_nightly_script
tags:
- linux
......@@ -57,16 +57,16 @@ ctest_matlab:
ctest_nightly_macos:
<<: *ctest_nightly_script
variables: {BUILD_WRAPPER_MATLAB: "ON", BUILD_WRAPPER_PYTHON: "ON", SLOW_TESTS: "ON", DONT_PYPLOT_FAUST_TIME: "ON", NOPY2: "ON", BUILD_MULTITHREAD: "OFF"} # set mt to OFF because MacOS is kind of tricky to configure with OpenMP
tags:
- macos
ctest_nightly_win7:
.ctest_nightly_win10:
<<: *ctest_script
variables: {BUILD_WRAPPER_MATLAB: "ON", BUILD_WRAPPER_PYTHON: "OFF", SLOW_TESTS: "ON"}
only:
- schedules
tags:
- win7
- win10
pkg_macos:
stage: pkg_rev
......
......@@ -8,9 +8,9 @@ set(CTEST_BUILD_NAME "${CMAKE_SYSTEM}_${CMAKE_HOST_SYSTEM_PROCESSOR}")
if(WIN32)
set(CTEST_SITE "FaustWin")
set (CTEST_CMAKE_GENERATOR "MinGW Makefiles")
set(CTEST_CMAKE_GENERATOR "Visual Studio 14 Win64")
# set above seems to be ignored
set(CONF_OPTIONS "${CONF_OPTIONS} -G 'MinGW Makefiles' -DMATIO_INC_DIR=$ENV{MATIO_INC_DIR} -DMATIO_LIB_FILE=$ENV{MATIO_LIB_FILE}")
set(CONF_OPTIONS "${CONF_OPTIONS} -G 'Visual Studio 14 Win64' -DMATIO_INC_DIR=$ENV{MATIO_INC_DIR} -DMATIO_LIB_FILE=$ENV{MATIO_LIB_FILE}")
elseif(APPLE AND UNIX)
set (CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_SITE "FaustMacOS")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment