X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMETraceCollector%2FTest%2FTestSALOMETraceCollector.py;h=5f701097239e9f71de9e065508444964984cd917;hb=4d61f5b8863253a259cde301c39b60909a6b18fa;hp=0078e1d5aafa4261215111e9042f9f8d082f8808;hpb=641929d327319a80b4fc6f6157605a21f46413c4;p=modules%2Fkernel.git diff --git a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py old mode 100755 new mode 100644 index 0078e1d5a..5f7010972 --- a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py +++ b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py @@ -1,5 +1,6 @@ +#! /usr/bin/env python3 # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2021 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 +22,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 +46,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)