Merge branch 'V8_0_0_BR'

[modules/yacs.git] / src / SALOMEDS / Test / TestSALOMEDS.py

diff --git a/src/SALOMEDS/Test/TestSALOMEDS.py b/src/SALOMEDS/Test/TestSALOMEDS.py
index 1627a6d4b32ded6a66316cd8cdcb9bd714b7f735..ce38430fd1aef76a2479c7f3ae10bd47c14e386c 100644 (file)
--- a/src/SALOMEDS/Test/TestSALOMEDS.py
+++ b/src/SALOMEDS/Test/TestSALOMEDS.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -7,7 +7,7 @@
 # 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
@@ -22,14 +22,16 @@
 #
 
 import sys, os,signal,string,commands
+import subprocess
 import runSalome
 import orbmodule
 import TestKiller
+import setenv
 
 # get SALOME environment :
 
-args, modules_list, modules_root_dir = runSalome.get_config()
-runSalome.set_env(args, modules_list, modules_root_dir)
+args, modules_list, modules_root_dir = setenv.get_config()
+setenv.set_env(args, modules_list, modules_root_dir)
 
 # launch CORBA naming server
 
@@ -43,9 +45,11 @@ clt.waitLogger("Logger")
 
 # execute Unit Test
 
-command = ['TestSALOMEDS']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+command = ['./TestSALOMEDS']
+ret = subprocess.call(command)
 
-# kill Test process 
+# kill Test process
 
 TestKiller.killProcess(runSalome.process_id)
+TestKiller.closeSalome()
+exit(ret)