Merge Python 3 porting.

[modules/yacs.git] / src / yacsloader_swig / Test / YacsLoaderInSessionTest.sh.in

diff --git a/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in b/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
index 4b6a1a6d2bc9bb7e78f25f294dea1be19a252195..29b9d06d31a4fb451409a3805ed86317f466cb0f 100644 (file)
--- a/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
+++ b/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Copyright (C) 2006-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2006-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,61 +26,83 @@
 pidecho=$!
 echo $pidecho > "/tmp/YACSTEST_PidEcho"
 
-python @top_srcdir@/src/yacsloader/Test/waitContainers.py
+python @CMAKE_SOURCE_DIR@/src/yacsloader/Test/waitContainers.py
 
 # --- launch unit tests
 
-export ROOT_SAMPLES=@ROOT_SRCDIR@/src/yacsloader/samples
-export TESTCOMPONENT_ROOT_DIR=@top_builddir@/src/runtime/Test
+export ROOT_SAMPLES=@CMAKE_SOURCE_DIR@/src/yacsloader/samples
+export TESTCOMPONENT_ROOT_DIR=@CMAKE_BINARY_DIR@/src/runtime/Test
 
-export PYTHONPATH=..:../.libs:@top_srcdir@/src/yacsloader_swig:${PYTHONPATH}
-export PYTHONPATH=../../runtime_swig:../../runtime_swig/.libs:@top_srcdir@/src/runtime_swig:${PYTHONPATH}
-export PYTHONPATH=../../engine_swig:../../engine_swig/.libs:@top_srcdir@/src/engine_swig:${PYTHONPATH}
-export PYTHONPATH=../../yacsloader/Test:${PYTHONPATH}
+export PYTHONPATH=@CMAKE_BINARY_DIR@/src/yacsloader_swig:$PYTHONPATH
+export PYTHONPATH=@CMAKE_BINARY_DIR@/src/runtime_swig:$PYTHONPATH
+export PYTHONPATH=@CMAKE_BINARY_DIR@/src/engine_swig:$PYTHONPATH
+export PYTHONPATH=@CMAKE_CURRENT_SOURCE_DIR@:$PYTHONPATH
+export PYTHONPATH=@CMAKE_SOURCE_DIR@/src/yacsloader/Test:$PYTHONPATH
 
-python  @srcdir@/testExec.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testExec.py
 ret0=$?
 if [ $ret0 -gt 0 ]; then
   echo "exec status testExec : " $ret0
   exit $ret0
 fi
 
-python  @srcdir@/testResume.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testResume.py
 ret1=$?
 if [ $ret1 -gt 0 ]; then
   echo "exec status testResume : " $ret1
   exit $ret1
 fi
 
-python  @srcdir@/testLoader.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testLoader.py
 ret2=$?
 if [ $ret2 -gt 0 ]; then
   echo "exec status testLoader : " $ret2
   exit $ret2
 fi
 
-python  @srcdir@/testEdit.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testEdit.py
 ret3=$?
 if [ $ret3 -gt 0 ]; then
   echo "exec status testEdit : " $ret3
   exit $ret3
 fi
 
-python  @srcdir@/testSave.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testSave.py
 ret4=$?
 if [ $ret4 -gt 0 ]; then
   echo "exec status testSave : " $ret4
   exit $ret4
 fi
 
-python  @srcdir@/testRefcount.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testRefcount.py
 ret5=$?
 if [ $ret5 -gt 0 ]; then
   echo "exec status testRefcount : " $ret5
   exit $ret5
 fi
 
-let ret=$ret0+$ret1+$ret2+$ret3+$ret4+$ret5
+python  @CMAKE_CURRENT_SOURCE_DIR@/testSaveLoadRun.py
+ret6=$?
+if [ $ret6 -gt 0 ]; then
+  echo "exec status testSaveLoadRun : " $ret6
+  exit $ret6
+fi
+
+python  @CMAKE_CURRENT_SOURCE_DIR@/testProgress.py
+ret7=$?
+if [ $ret7 -gt 0 ]; then
+  echo "exec status testProgress : " $ret7
+  exit $ret7
+fi
+
+python  @CMAKE_CURRENT_SOURCE_DIR@/testHPDecorator.py
+ret8=$?
+if [ $ret8 -gt 0 ]; then
+  echo "exec status testProgress : " $ret8
+  exit $ret8
+fi
+
+let ret=$ret0+$ret1+$ret2+$ret3+$ret4+$ret5+$ret6+$ret7+$ret8
 
 # --- return unit tests status