A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try to get tesh ignoring the cruft of Jenkins and friends
[simgrid.git]
/
tools
/
cmake
/
Tests.cmake
diff --git
a/tools/cmake/Tests.cmake
b/tools/cmake/Tests.cmake
index
f15edfd
..
f533ea4
100644
(file)
--- a/
tools/cmake/Tests.cmake
+++ b/
tools/cmake/Tests.cmake
@@
-6,6
+6,7
@@
IF(enable_smpi AND NOT WIN32)
execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun)
ENDIF()
execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun)
ENDIF()
+SET(TESH_OPTION "--ignore-jenkins")
SET(TESH_COMMAND ${CMAKE_BINARY_DIR}/bin/tesh)
IF(CMAKE_HOST_WIN32)
SET(TESH_OPTION ${TESH_OPTION} --timeout 50)
SET(TESH_COMMAND ${CMAKE_BINARY_DIR}/bin/tesh)
IF(CMAKE_HOST_WIN32)
SET(TESH_OPTION ${TESH_OPTION} --timeout 50)
@@
-27,7
+28,11
@@
MACRO(ADD_TESH NAME)
IF(WIN32)
STRING(REPLACE "§" "\;" ARGT "${ARGT}")
ENDIF()
IF(WIN32)
STRING(REPLACE "§" "\;" ARGT "${ARGT}")
ENDIF()
- ADD_TEST(${NAME} ${TESH_COMMAND} ${TESH_OPTION} ${ARGT})
+ if(TESH_WRAPPER)
+ ADD_TEST(${NAME} ${TESH_COMMAND} --wrapper "${TESH_WRAPPER}" ${TESH_OPTION} ${ARGT})
+ else()
+ ADD_TEST(${NAME} ${TESH_COMMAND} ${TESH_OPTION} ${ARGT})
+ endif()
ENDMACRO()
MACRO(ADD_TESH_FACTORIES NAME FACTORIES)
ENDMACRO()
MACRO(ADD_TESH_FACTORIES NAME FACTORIES)