From 2d739c74b682cebcc2e3606d3df07a80ddd017db Mon Sep 17 00:00:00 2001
From: canape <canape@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 1 Feb 2008 10:51:31 +0000
Subject: [PATCH] Test peo modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@913 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-peo/test/CMakeLists.txt       | 26 ++++++-------------
 trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp  |  8 ------
 trunk/paradiseo-peo/test/t-EASyncIsland.cpp   |  8 ------
 .../{t-MultiStart.cpp => t-Mpdallexit.cpp}    |  2 --
 .../{t-ParallelEval.cpp => t-Mpdboot.cpp}     |  2 --
 trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp  |  8 ------
 .../paradiseo-peo/test/t-PSOWorstPosition.cpp |  8 ------
 .../test/t-ParallelTransform.cpp              |  8 ------
 8 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp
 delete mode 100644 trunk/paradiseo-peo/test/t-EASyncIsland.cpp
 rename trunk/paradiseo-peo/test/{t-MultiStart.cpp => t-Mpdallexit.cpp} (53%)
 rename trunk/paradiseo-peo/test/{t-ParallelEval.cpp => t-Mpdboot.cpp} (51%)
 delete mode 100644 trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp
 delete mode 100644 trunk/paradiseo-peo/test/t-PSOWorstPosition.cpp
 delete mode 100644 trunk/paradiseo-peo/test/t-ParallelTransform.cpp

diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index 6baf6886b..4ad9443e1 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -59,28 +59,18 @@ ENDIF(WIN32 AND NOT CYGWIN)
 ### 3) Define your targets and link the librairies
 ######################################################################################
 
-SET (TEST_LIST     t-EAAsyncIslandLib)
-
-    #              t-ParallelEval
-    #				  t-ParallelTransform
-	#			  t-MultiStart
-	#			  t-PSOSelect
-	#			  t-EAAsyncIsland
-	#			  t-EASyncIsland
-	#			  t-PSOGlobalBest
-	#			  t-PSOWorstPosition
-			    
-SET (TEST_LIBRARY t-ParallelEvalLib
+SET (TEST_LIST    t-Mpdboot
+				  t-ParallelEvalLib
 				  t-ParallelTransformLib
 				  t-MultiStartLib
+				  t-PSOSelect
 				  t-EAAsyncIslandLib
 				  t-EASyncIslandLib
 				  t-PSOGlobalBestLib
 				  t-PSOWorstPositionLib
-				)
-			    
-				
-FOREACH (test ${TEST_LIST} ${TEST_LIBRARY})
+				  t-Mpdallexit)
+	
+FOREACH (test ${TEST_LIST})
 	  SET ("T_${test}_SOURCES" "${test}.cpp")
 ENDFOREACH (test)
 
@@ -88,7 +78,7 @@ ENDFOREACH (test)
 IF(ENABLE_CMAKE_TESTING)
 	
 	# Add the tests
-	FOREACH (test ${TEST_LIST} ${TEST_LIBRARY})
+	FOREACH (test ${TEST_LIST})
 		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})  
 	ENDFOREACH (test)
 	
@@ -97,7 +87,7 @@ IF(ENABLE_CMAKE_TESTING)
 	ENDFOREACH (test)
 	
 	# Link the librairies
-	FOREACH (test ${TEST_LIST} ${TEST_LIBRARY})
+	FOREACH (test ${TEST_LIST})
 	 TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo)
 	ENDFOREACH (test)
 	
diff --git a/trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp b/trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp
deleted file mode 100644
index 715849ccf..000000000
--- a/trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <peo.h>
-
-int main (int __argc, char *__argv[])
-{
-	system("mpdboot");
-	system("mpiexec -n 4 ./t-EAAsyncIslandLib @param ");
-	system("mpdallexit");
-}
diff --git a/trunk/paradiseo-peo/test/t-EASyncIsland.cpp b/trunk/paradiseo-peo/test/t-EASyncIsland.cpp
deleted file mode 100644
index 7971a5014..000000000
--- a/trunk/paradiseo-peo/test/t-EASyncIsland.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <peo.h>
-
-int main (int __argc, char *__argv[])
-{
-	system("mpdboot");
-	system("mpiexec -n 4 ./t-EASyncIslandLib @param ");
-	system("mpdallexit");
-}
diff --git a/trunk/paradiseo-peo/test/t-MultiStart.cpp b/trunk/paradiseo-peo/test/t-Mpdallexit.cpp
similarity index 53%
rename from trunk/paradiseo-peo/test/t-MultiStart.cpp
rename to trunk/paradiseo-peo/test/t-Mpdallexit.cpp
index ce8599318..6a61d2482 100644
--- a/trunk/paradiseo-peo/test/t-MultiStart.cpp
+++ b/trunk/paradiseo-peo/test/t-Mpdallexit.cpp
@@ -2,7 +2,5 @@
 
 int main (int __argc, char *__argv[])
 {
-	system("mpdboot");
-	system("mpiexec -n 4 ./t-MultiStartLib @param ");
 	system("mpdallexit");
 }
diff --git a/trunk/paradiseo-peo/test/t-ParallelEval.cpp b/trunk/paradiseo-peo/test/t-Mpdboot.cpp
similarity index 51%
rename from trunk/paradiseo-peo/test/t-ParallelEval.cpp
rename to trunk/paradiseo-peo/test/t-Mpdboot.cpp
index 57f791c60..3ef918bc9 100644
--- a/trunk/paradiseo-peo/test/t-ParallelEval.cpp
+++ b/trunk/paradiseo-peo/test/t-Mpdboot.cpp
@@ -3,6 +3,4 @@
 int main (int __argc, char *__argv[])
 {
 	system("mpdboot");
-	system("mpiexec -n 4 ./t-ParallelEvalLib @param ");
-	system("mpdallexit");
 }
diff --git a/trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp b/trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp
deleted file mode 100644
index 7ef258903..000000000
--- a/trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <peo.h>
-
-int main (int __argc, char *__argv[])
-{
-	system("mpdboot");
-	system("mpiexec -n 4 ./t-PSOGlobalBestLib @param ");
-	system("mpdallexit");
-}
diff --git a/trunk/paradiseo-peo/test/t-PSOWorstPosition.cpp b/trunk/paradiseo-peo/test/t-PSOWorstPosition.cpp
deleted file mode 100644
index 269e2b79c..000000000
--- a/trunk/paradiseo-peo/test/t-PSOWorstPosition.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <peo.h>
-
-int main (int __argc, char *__argv[])
-{
-	system("mpdboot");
-	system("mpiexec -n 4 ./t-PSOWorstPositionLib @param ");
-	system("mpdallexit");
-}
diff --git a/trunk/paradiseo-peo/test/t-ParallelTransform.cpp b/trunk/paradiseo-peo/test/t-ParallelTransform.cpp
deleted file mode 100644
index b61463f48..000000000
--- a/trunk/paradiseo-peo/test/t-ParallelTransform.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <peo.h>
-
-int main (int __argc, char *__argv[])
-{
-	system("mpdboot");
-	system("mpiexec -n 4 ./t-ParallelTransformLib @param ");
-	system("mpdallexit");
-}