nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

corrected min test config and avoid linking start/stop tests with the libs

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1172 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
legrand 2008-03-20 09:17:15 +00:00
commit 7d119350ff
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
trunk/paradiseo-peo/test/CMakeLists.txt
View file

@ -74,18 +74,23 @@ ENDFOREACH (test)
IF(ENABLE_MINIMAL_CMAKE_TESTING) IF(ENABLE_MINIMAL_CMAKE_TESTING)
SET (MIN_TEST_LIST t-MultiStart) SET (MIN_TEST_LIST t-MultiStart)
FOREACH (test ${TEST_RUN})
ADD_TEST(${test} ${test}) FOREACH (testrun ${TEST_RUN})
ENDFOREACH (test) ADD_EXECUTABLE(${testrun} ${T_${testrun}_SOURCES})
ADD_TEST(${testrun} ${testrun})
ENDFOREACH (testrun)
FOREACH (mintest ${MIN_TEST_LIST}) FOREACH (mintest ${MIN_TEST_LIST})
SET ("T_${mintest}_SOURCES" "${mintest}.cpp") SET ("T_${mintest}_SOURCES" "${mintest}.cpp")
ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES})
ADD_TEST(${mintest} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${mintest}" "@param") ADD_TEST(${mintest} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${mintest}" "@param")
TARGET_LINK_LIBRARIES(${mintest} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) TARGET_LINK_LIBRARIES(${mintest} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
ENDFOREACH (mintest) ENDFOREACH (mintest)
FOREACH (test ${TEST_STOP})
ADD_TEST(${test} ${test}) FOREACH (teststop ${TEST_STOP})
ENDFOREACH (test) ADD_EXECUTABLE(${teststop} ${T_${teststop}_SOURCES})
ADD_TEST(${teststop} ${teststop})
ENDFOREACH (teststop)
ELSEIF(ENABLE_CMAKE_TESTING) ELSEIF(ENABLE_CMAKE_TESTING)
@ -93,20 +98,19 @@ ELSEIF(ENABLE_CMAKE_TESTING)
ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
ENDFOREACH (test) ENDFOREACH (test)
FOREACH (test ${TEST_RUN}) FOREACH (testrun ${TEST_RUN})
ADD_TEST(${test} ${test}) ADD_TEST(${testrun} ${testrun})
ENDFOREACH (test) ENDFOREACH (testrun)
FOREACH (test ${TEST_LIST}) FOREACH (test ${TEST_LIST})
ADD_TEST(${test} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${test}" "@param") ADD_TEST(${test} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${test}" "@param")
ENDFOREACH (test) ENDFOREACH (test)
FOREACH (test ${TEST_STOP}) FOREACH (teststop ${TEST_STOP})
ADD_TEST(${test} ${test}) ADD_TEST(${teststop} ${teststop})
ENDFOREACH (test) ENDFOREACH (teststop)
# Link the librairies FOREACH (test ${TEST_LIST})
FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo) TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
ENDFOREACH (test) ENDFOREACH (test)

2
trunk/paradiseo-peo/test/t-Mpdallexit.cpp
View file

@ -34,7 +34,7 @@
* *
*/ */
#include <iostream>
#include <peo.h> #include <peo.h>
int main (int __argc, char *__argv[]) int main (int __argc, char *__argv[])

2
trunk/paradiseo-peo/test/t-Mpdboot.cpp
View file

@ -34,7 +34,7 @@
* *
*/ */
#include <iostream>
#include <peo.h> #include <peo.h>
int main (int __argc, char *__argv[]) int main (int __argc, char *__argv[])