X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FKernelHelpers%2FTest%2FTestKernelHelpers.py;h=23855be65e3d1c05831dcecbec45c248c8667eb2;hb=718e0abe0126e5e53b3ba41fff1028efcf5bc887;hp=ba69f9baa02e4e36c26b2094b25d15d5e7e6e295;hpb=641929d327319a80b4fc6f6157605a21f46413c4;p=modules%2Fkernel.git diff --git a/src/KernelHelpers/Test/TestKernelHelpers.py b/src/KernelHelpers/Test/TestKernelHelpers.py old mode 100755 new mode 100644 index ba69f9baa..23855be65 --- a/src/KernelHelpers/Test/TestKernelHelpers.py +++ b/src/KernelHelpers/Test/TestKernelHelpers.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 @@ -22,14 +22,16 @@ # import sys, os,signal,string,commands +import subprocess import runSalome +import setenv import orbmodule import TestKiller # 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 = ['TestKernelHelpers'] -ret = os.spawnvp(os.P_WAIT, command[0], command) +command = ['./TestKernelHelpers'] +ret = subprocess.call(command) -# kill Test process +# kill Test process TestKiller.killProcess(runSalome.process_id) +TestKiller.closeSalome() +exit(ret)