Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 31d04d8f authored by hhakim's avatar hhakim
Browse files

Simplify/Speed up MATLAB_DEMO_INSTALL test.

No need to run again the demo scripts which are already triggered by MATLAB_DEMO_BUILD.
MATLAB_DEMO_INSTALL is no longer related to SLOW_TESTS option.
parent e783c3b0
No related branches found
No related tags found
No related merge requests found
Pipeline #856205 passed
......@@ -45,8 +45,8 @@ if(BUILD_TESTING)
endif()
add_test(NAME MATLAB_FACT_HADAMARD_MEX COMMAND ${FAUST_SRC_TEST_TOOL_DIR}/windows_test_matlab.bat "addpath('${FAUST_BIN_TEST_BIN_DIR}'@'${FAUST_BIN_TEST_TOOLS_DIR}')$set_path$hier_fact_test('matrix_HADAMARD_32'@'config_HADAMARD_32'@5941@30@'MEX')$" "${FAUST_BIN_TEST_BIN_DIR}/MATLAB_FACT_HADAMARD_MEX")
add_test(NAME MATLAB_DEMO_INSTALL COMMAND ${FAUST_SRC_TEST_TOOL_DIR}/windows_test_matlab.bat "addpath('${CMAKE_INSTALL_MATLAB_PREFIX}')$setup_FAUST$import matfaust.rand$disp(rand(10,10))$" "${FAUST_BIN_TEST_BIN_DIR}/MATLAB_DEMO_INSTALL")
if(${SLOW_TESTS})
add_test(NAME MATLAB_DEMO_INSTALL COMMAND ${FAUST_SRC_TEST_TOOL_DIR}/windows_test_matlab.bat "addpath('${CMAKE_INSTALL_MATLAB_PREFIX}')$setup_FAUST$import matfaust.demo.runall$runall$" "${FAUST_BIN_TEST_BIN_DIR}/MATLAB_DEMO_INSTALL")
add_test(NAME MATLAB_DEMO_BUILD COMMAND ${FAUST_SRC_TEST_TOOL_DIR}/windows_test_matlab.bat "addpath('${FAUST_MATLAB_BIN_DIR}')$setup_FAUST$import matfaust.demo.runall$runall$" "${FAUST_BIN_TEST_BIN_DIR}/MATLAB_DEMO_BUILD")
endif()
add_test(NAME MATLAB_FAUST_CONFIG1 COMMAND ${FAUST_SRC_TEST_TOOL_DIR}/windows_test_matlab.bat "addpath('${FAUST_BIN_TEST_BIN_DIR}'@'${FAUST_BIN_TEST_TOOLS_DIR}')$set_path$test_matlab_faust(5@4@10@3)$" "${FAUST_BIN_TEST_BIN_DIR}/MATLAB_FAUST_1")
......@@ -69,8 +69,9 @@ if(BUILD_TESTING)
add_test(NAME MATLAB_FACT_HADAMARD_MEX COMMAND matlab -nojvm -nodisplay -r "try;testpass=0;addpath('${FAUST_BIN_TEST_BIN_DIR}','${FAUST_BIN_TEST_TOOLS_DIR}');set_path;hier_fact_test('matrix_HADAMARD_32','config_HADAMARD_32',5941,30,'MEX');catch ME ;testpass=-1;disp(getReport(ME)); end ; exit(testpass)")
add_test(NAME MATLAB_DEMO_INSTALL COMMAND matlab -nodesktop -r "try;testpass=0;addpath('${CMAKE_INSTALL_MATLAB_PREFIX}');setup_FAUST;import matfaust.rand;which matfaust.rand;disp(rand(10,10));catch ME ;testpass=-1;disp(getReport(ME)); end ; exit(testpass)")
if(${SLOW_TESTS})
add_test(NAME MATLAB_DEMO_INSTALL COMMAND matlab -nodesktop -r "try;testpass=0;addpath('${CMAKE_INSTALL_MATLAB_PREFIX}');setup_FAUST;import matfaust.demo.runall;runall;catch ME ;testpass=-1;disp(getReport(ME)); end ; exit(testpass)")
add_test(NAME MATLAB_DEMO_BUILD COMMAND matlab -nodesktop -r "cd('${FAUST_MATLAB_BIN_DIR}')try;testpass=0;addpath('${FAUST_MATLAB_BIN_DIR}');setup_FAUST;import matfaust.demo.runall;runall;catch ME ;testpass=-1;disp(getReport(ME)); end ; exit(testpass)")
endif(${SLOW_TESTS})
......@@ -128,7 +129,7 @@ if(BUILD_TESTING)
set_tests_properties(MATLAB_FACT_HIER_MEX PROPERTIES TIMEOUT 1000)
if(${SLOW_TESTS})
set_tests_properties(MATLAB_DEMO_INSTALL MATLAB_DEMO_BUILD PROPERTIES TIMEOUT 6000)
set_tests_properties(MATLAB_DEMO_BUILD PROPERTIES TIMEOUT 6000)
endif()
if(NOT WIN32)
set_tests_properties(MATLAB_FAUST_CONFIG_REAL1 MATLAB_FAUST_CONFIG_REAL2 MATLAB_FAUST_CONFIG_REAL3 MATLAB_FAUST_CONFIG_REAL4 MATLAB_FAUST_CONFIG_CPLX1 MATLAB_FAUST_CONFIG_CPLX2 MATLAB_FAUST_2 PROPERTIES TIMEOUT 90)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment