Merge branch 'master' into V9_dev

[modules/kernel.git] / src / SALOMETraceCollector / Test / TestSALOMETraceCollector.py

diff --git a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
index 38bd989fb52cc95e3e887699bd3f3d11479f2a5f..f703a9271fb0b3c38e6133d3afde3dbd602e2e6f 100644 (file)
--- a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
+++ b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  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
@@ -21,15 +21,17 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-import sys, os,signal,string,commands
+import sys, os,signal,string,subprocess
+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,10 @@ clt.waitLogger("Logger")
 
 # execute Unit Test
 
-command = ['TestSALOMETraceCollector']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+command = ['./TestSALOMETraceCollector']
+ret = subprocess.call(command)
 
-# kill Test process 
+# kill Test process
 
 TestKiller.killProcess(runSalome.process_id)
+exit(ret)