X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMETraceCollector%2FTest%2FTestSALOMETraceCollector.py;h=f703a9271fb0b3c38e6133d3afde3dbd602e2e6f;hb=66b7b8c5d71f081f82f5dad2a3221a53ba9e4ee5;hp=0078e1d5aafa4261215111e9042f9f8d082f8808;hpb=a63265d524e8436588a7bb82147a69812c153b1b;p=modules%2Fkernel.git diff --git a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py index 0078e1d5a..f703a9271 100644 --- a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py +++ b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 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 @@ -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)