Merge from V6_main_20120808 08Aug12

[modules/yacs.git] / src / yacsloader / Test / YacsLoaderTest.sh.in

diff --git a/src/yacsloader/Test/YacsLoaderTest.sh.in b/src/yacsloader/Test/YacsLoaderTest.sh.in
index 732d58f4b219f53599e3018ae0e2ef95e8a96695..59b6b25edc6b1d86072b67c0b35f13925202ad0f 100755 (executable)
--- a/src/yacsloader/Test/YacsLoaderTest.sh.in
+++ b/src/yacsloader/Test/YacsLoaderTest.sh.in
@@ -1,21 +1,21 @@
 #!/bin/bash
-#  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+# Copyright (C) 2006-2012  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.
+# 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.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 if test -f @KERNEL_ROOT_DIR@/bin/salome/appli_gen.py ; then
@@ -51,27 +51,18 @@ EOF
 
   chmod +x @builddir@/YacsLoaderInSessionTest.sh
   ./runSession @builddir@/YacsLoaderInSessionTest.sh
-  ret1=$?
-
-  # ---------------------------------------------------------------------------
-  # --- second set of tests: Python scripts
-
-  chmod +x @builddir@/YacsLoaderInSessionTest2.sh
-  ./runSession @builddir@/YacsLoaderInSessionTest2.sh
-  ret2=$?
+  ret=$?
 
   # ---------------------------------------------------------------------------
 
   kill -9 `cat "/tmp/YACSTEST_PidEcho"`
   ./runSession killSalome.py
 
-  echo "exec status YacsLoaderInSessionTest.sh "  $ret1
-  echo "exec status YacsLoaderInSessionTest2.sh " $ret2
-  let ret=$ret1+$ret2
+  echo "exec status YacsLoaderInSessionTest.sh "  $ret
 
   # --- delete all the SALOME Application environment
   
-  ./bin/salome/appli_clean.sh
+  ./bin/salome/appli_clean.sh -f
 
 else