Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update: 2016
[modules/kernel.git]
/
src
/
KernelHelpers
/
Test
/
TestKernelHelpers.py
diff --git
a/src/KernelHelpers/Test/TestKernelHelpers.py
b/src/KernelHelpers/Test/TestKernelHelpers.py
index ba69f9baa02e4e36c26b2094b25d15d5e7e6e295..23855be65e3d1c05831dcecbec45c248c8667eb2 100644
(file)
--- a/
src/KernelHelpers/Test/TestKernelHelpers.py
+++ b/
src/KernelHelpers/Test/TestKernelHelpers.py
@@
-1,5
+1,5
@@
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-201
6
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
#
# 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 sys, os,signal,string,commands
+import subprocess
import runSalome
import runSalome
+import setenv
import orbmodule
import TestKiller
# get SALOME environment :
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
# launch CORBA naming server
@@
-43,9
+45,11
@@
clt.waitLogger("Logger")
# execute Unit Test
# 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.killProcess(runSalome.process_id)
+TestKiller.closeSalome()
+exit(ret)