From f6d5ac3c6b50990e1337d0c9036ea702df05a9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= <adele.harrissart@gmail.com>
Date: Wed, 18 Jun 2014 10:07:59 +0200
Subject: [PATCH] Move out eompi test folder.

---
 eo/src/eoPopEvalFunc.h                              | 8 ++++----
 {eo/test/mpi => eompi/test}/CMakeLists.txt          | 0
 {eo/test/mpi => eompi/test}/DISTRIB_XP_README.md    | 0
 {eo/test/mpi => eompi/test}/experiments.json        | 0
 {eo/test/mpi => eompi/test}/gen-xp.py               | 0
 {eo/test/mpi => eompi/test}/t-mpi-common.h          | 0
 {eo/test/mpi => eompi/test}/t-mpi-distrib-exp.cpp   | 2 +-
 {eo/test/mpi => eompi/test}/t-mpi-eval.cpp          | 2 +-
 {eo/test/mpi => eompi/test}/t-mpi-multipleRoles.cpp | 6 +++---
 {eo/test/mpi => eompi/test}/t-mpi-multistart.cpp    | 2 +-
 {eo/test/mpi => eompi/test}/t-mpi-parallelApply.cpp | 6 +++---
 {eo/test/mpi => eompi/test}/t-mpi-wrapper.cpp       | 6 +++---
 {eo/test/mpi => eompi/test}/template-job.cpp        | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename {eo/test/mpi => eompi/test}/CMakeLists.txt (100%)
 rename {eo/test/mpi => eompi/test}/DISTRIB_XP_README.md (100%)
 rename {eo/test/mpi => eompi/test}/experiments.json (100%)
 rename {eo/test/mpi => eompi/test}/gen-xp.py (100%)
 rename {eo/test/mpi => eompi/test}/t-mpi-common.h (100%)
 rename {eo/test/mpi => eompi/test}/t-mpi-distrib-exp.cpp (99%)
 rename {eo/test/mpi => eompi/test}/t-mpi-eval.cpp (99%)
 rename {eo/test/mpi => eompi/test}/t-mpi-multipleRoles.cpp (98%)
 rename {eo/test/mpi => eompi/test}/t-mpi-multistart.cpp (99%)
 rename {eo/test/mpi => eompi/test}/t-mpi-parallelApply.cpp (98%)
 rename {eo/test/mpi => eompi/test}/t-mpi-wrapper.cpp (97%)
 rename {eo/test/mpi => eompi/test}/template-job.cpp (98%)

diff --git a/eo/src/eoPopEvalFunc.h b/eo/src/eoPopEvalFunc.h
index 7fcad1467..d9bc77750 100644
--- a/eo/src/eoPopEvalFunc.h
+++ b/eo/src/eoPopEvalFunc.h
@@ -31,10 +31,10 @@
 #include <apply.h>
 
 # ifdef WITH_MPI
-#include <mpi/eoMpi.h>
-#include <mpi/eoTerminateJob.h>
-#include <mpi/eoMpiAssignmentAlgorithm.h>
-#include <mpi/eoParallelApply.h>
+#include <eoMpi.h>
+#include <eoTerminateJob.h>
+#include <eoMpiAssignmentAlgorithm.h>
+#include <eoParallelApply.h>
 #include <utils/eoParallel.h>
 
 #include <cmath> // ceil
diff --git a/eo/test/mpi/CMakeLists.txt b/eompi/test/CMakeLists.txt
similarity index 100%
rename from eo/test/mpi/CMakeLists.txt
rename to eompi/test/CMakeLists.txt
diff --git a/eo/test/mpi/DISTRIB_XP_README.md b/eompi/test/DISTRIB_XP_README.md
similarity index 100%
rename from eo/test/mpi/DISTRIB_XP_README.md
rename to eompi/test/DISTRIB_XP_README.md
diff --git a/eo/test/mpi/experiments.json b/eompi/test/experiments.json
similarity index 100%
rename from eo/test/mpi/experiments.json
rename to eompi/test/experiments.json
diff --git a/eo/test/mpi/gen-xp.py b/eompi/test/gen-xp.py
similarity index 100%
rename from eo/test/mpi/gen-xp.py
rename to eompi/test/gen-xp.py
diff --git a/eo/test/mpi/t-mpi-common.h b/eompi/test/t-mpi-common.h
similarity index 100%
rename from eo/test/mpi/t-mpi-common.h
rename to eompi/test/t-mpi-common.h
diff --git a/eo/test/mpi/t-mpi-distrib-exp.cpp b/eompi/test/t-mpi-distrib-exp.cpp
similarity index 99%
rename from eo/test/mpi/t-mpi-distrib-exp.cpp
rename to eompi/test/t-mpi-distrib-exp.cpp
index 46a4efa57..db65344e8 100644
--- a/eo/test/mpi/t-mpi-distrib-exp.cpp
+++ b/eompi/test/t-mpi-distrib-exp.cpp
@@ -39,7 +39,7 @@
 
 # include <eo>
 
-# include <mpi/eoMpi.h>
+# include <eoMpi.h>
 # include "t-mpi-common.h"
 
 using namespace eo::mpi;
diff --git a/eo/test/mpi/t-mpi-eval.cpp b/eompi/test/t-mpi-eval.cpp
similarity index 99%
rename from eo/test/mpi/t-mpi-eval.cpp
rename to eompi/test/t-mpi-eval.cpp
index fb97701d2..c34ab1aab 100644
--- a/eo/test/mpi/t-mpi-eval.cpp
+++ b/eompi/test/t-mpi-eval.cpp
@@ -32,7 +32,7 @@ Authors:
 #include <es/make_real.h>
 #include "../real_value.h"
 
-#include <mpi/eoMpi.h>
+#include <eoMpi.h>
 
 #include <vector>
 using namespace std;
diff --git a/eo/test/mpi/t-mpi-multipleRoles.cpp b/eompi/test/t-mpi-multipleRoles.cpp
similarity index 98%
rename from eo/test/mpi/t-mpi-multipleRoles.cpp
rename to eompi/test/t-mpi-multipleRoles.cpp
index 3a525126b..7f10d9453 100644
--- a/eo/test/mpi/t-mpi-multipleRoles.cpp
+++ b/eompi/test/t-mpi-multipleRoles.cpp
@@ -37,9 +37,9 @@ Authors:
  * This test requires exactly 7 hosts. If the size is bigger, an exception will be thrown at the beginning.
  **/
 
-# include <mpi/eoMpi.h>
-# include <mpi/eoParallelApply.h>
-# include <mpi/eoTerminateJob.h>
+# include <eoMpi.h>
+# include <eoParallelApply.h>
+# include <eoTerminateJob.h>
 
 # include "t-mpi-common.h"
 
diff --git a/eo/test/mpi/t-mpi-multistart.cpp b/eompi/test/t-mpi-multistart.cpp
similarity index 99%
rename from eo/test/mpi/t-mpi-multistart.cpp
rename to eompi/test/t-mpi-multistart.cpp
index fb614e8ee..e58091601 100644
--- a/eo/test/mpi/t-mpi-multistart.cpp
+++ b/eompi/test/t-mpi-multistart.cpp
@@ -1,4 +1,4 @@
-# include <mpi/eoMultiStart.h>
+# include <eoMultiStart.h>
 using namespace eo::mpi;
 
 #include <stdexcept>
diff --git a/eo/test/mpi/t-mpi-parallelApply.cpp b/eompi/test/t-mpi-parallelApply.cpp
similarity index 98%
rename from eo/test/mpi/t-mpi-parallelApply.cpp
rename to eompi/test/t-mpi-parallelApply.cpp
index 559505bd1..6b49c1b84 100644
--- a/eo/test/mpi/t-mpi-parallelApply.cpp
+++ b/eompi/test/t-mpi-parallelApply.cpp
@@ -39,9 +39,9 @@ Authors:
  * beginning;
  */
 
-# include <mpi/eoMpi.h>
-# include <mpi/eoParallelApply.h>
-# include <mpi/eoTerminateJob.h>
+# include <eoMpi.h>
+# include <eoParallelApply.h>
+# include <eoTerminateJob.h>
 
 # include "t-mpi-common.h"
 
diff --git a/eo/test/mpi/t-mpi-wrapper.cpp b/eompi/test/t-mpi-wrapper.cpp
similarity index 97%
rename from eo/test/mpi/t-mpi-wrapper.cpp
rename to eompi/test/t-mpi-wrapper.cpp
index 7e5fa4d2f..dd64b50d4 100644
--- a/eo/test/mpi/t-mpi-wrapper.cpp
+++ b/eompi/test/t-mpi-wrapper.cpp
@@ -29,9 +29,9 @@ Authors:
  * instanciating the store.
  */
 
-# include <mpi/eoMpi.h>
-# include <mpi/eoParallelApply.h>
-# include <mpi/eoTerminateJob.h>
+# include <eoMpi.h>
+# include <eoParallelApply.h>
+# include <eoTerminateJob.h>
 
 # include "t-mpi-common.h"
 
diff --git a/eo/test/mpi/template-job.cpp b/eompi/test/template-job.cpp
similarity index 98%
rename from eo/test/mpi/template-job.cpp
rename to eompi/test/template-job.cpp
index 3d25e9736..949f2325d 100644
--- a/eo/test/mpi/template-job.cpp
+++ b/eompi/test/template-job.cpp
@@ -1,4 +1,4 @@
-# include <mpi/eoMpi.h>
+# include <eoMpi.h>
 
 using namespace eo::mpi;