From d61c06beb36c119ec089a04669f0b871e0bb73bf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Ribes?= <andre.ribes@edf.fr>
Date: Wed, 16 Jun 2010 12:00:27 +0200
Subject: [PATCH] - Ajout des tests dans l'installation - test: DATASSIM ->
 ADAO

---
 adm_local/make_common_starter.am                          | 3 +++
 configure.ac                                              | 3 +++
 src/Makefile.am                                           | 2 +-
 src/daEficas/{prefs_DATASSIM.py.in => prefs_ADAO.py.in}   | 0
 src/tests/Makefile.am                                     | 2 ++
 src/tests/daSalome/Makefile.am                            | 8 ++++++++
 ...ue_AnalysisFile.py => test000_Blue_AnalysisFile.py.in} | 2 +-
 7 files changed, 18 insertions(+), 2 deletions(-)
 rename src/daEficas/{prefs_DATASSIM.py.in => prefs_ADAO.py.in} (100%)
 create mode 100644 src/tests/Makefile.am
 create mode 100644 src/tests/daSalome/Makefile.am
 rename src/tests/daSalome/{test000_Blue_AnalysisFile.py => test000_Blue_AnalysisFile.py.in} (92%)

diff --git a/adm_local/make_common_starter.am b/adm_local/make_common_starter.am
index f02b90c..7bb83d1 100644
--- a/adm_local/make_common_starter.am
+++ b/adm_local/make_common_starter.am
@@ -12,6 +12,9 @@ salomeidldir       = $(prefix)/idl/salome
 # Directory for installing resource files
 salomeresdir       = $(prefix)/share/salome/resources/${MODULE_NAME}
 
+# Directory for installing tests files
+testsdir       = $(prefix)/tests
+
 # Directories for installing admin files
 admlocaldir       = $(prefix)/adm_local
 admlocalunixdir     = $(admlocaldir)/unix
diff --git a/configure.ac b/configure.ac
index 7b4e293..7859ba0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,9 @@ AC_CONFIG_FILES([
         src/daSalome/daGUI/daGuiImpl/Makefile
         src/daSalome/daGUI/daEficasWrapper/Makefile
         src/daSalome/daGUI/daEficasWrapper/eficasWrapper.py
+        src/tests/Makefile
+        src/tests/daSalome/Makefile
+        src/tests/daSalome/test000_Blue_AnalysisFile.py
         bin/Makefile
         bin/qtEficas_adao_study.py
         ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6836443..6998b32 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = daComposant daSalome daEficas
+SUBDIRS = daComposant daSalome daEficas tests
diff --git a/src/daEficas/prefs_DATASSIM.py.in b/src/daEficas/prefs_ADAO.py.in
similarity index 100%
rename from src/daEficas/prefs_DATASSIM.py.in
rename to src/daEficas/prefs_ADAO.py.in
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644
index 0000000..54b6585
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = daSalome
+
diff --git a/src/tests/daSalome/Makefile.am b/src/tests/daSalome/Makefile.am
new file mode 100644
index 0000000..1d82459
--- /dev/null
+++ b/src/tests/daSalome/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/adm_local/make_common_starter.am
+
+DATA_INST = \
+	    test000_Blue_AnalysisCode.py test000_Blue_AnalysisFile.py test000_Blue.py
+
+tests_DATA = ${DATA_INST}
+EXTRA_DIST = test000_Blue_AnalysisCode.py test000_Blue_AnalysisFile.py.in test000_Blue.py
+
diff --git a/src/tests/daSalome/test000_Blue_AnalysisFile.py b/src/tests/daSalome/test000_Blue_AnalysisFile.py.in
similarity index 92%
rename from src/tests/daSalome/test000_Blue_AnalysisFile.py
rename to src/tests/daSalome/test000_Blue_AnalysisFile.py.in
index 5e2531c..42dae9e 100644
--- a/src/tests/daSalome/test000_Blue_AnalysisFile.py
+++ b/src/tests/daSalome/test000_Blue_AnalysisFile.py.in
@@ -34,7 +34,7 @@ ObservationOperator_config["From"] = "String"
 study_config["ObservationOperator"] = ObservationOperator_config
 
 Analysis_config = {}
-Analysis_config["Data"] = "/home/aribes/Projets/DATASSIM_SRC/src/tests/daSalome/test000_Blue_AnalysisCode.py"
+Analysis_config["Data"] = "@prefix@/tests/daSalome/test000_Blue_AnalysisCode.py"
 Analysis_config["From"] = "File"
 study_config["Analysis"] = Analysis_config
 
-- 
2.39.2