X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMETraceCollector%2FTest%2FTestSALOMETraceCollector.py;h=9450cc62e802cef11e83c74acb42ba2a29a03bf4;hb=e43e8bd5d6ca0572b00f86cefdb63b0563e92ec8;hp=0078e1d5aafa4261215111e9042f9f8d082f8808;hpb=63414a08d9492c25c206579c1953ec6f390679fd;p=modules%2Fkernel.git

diff --git a/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py b/src/SALOMETraceCollector/Test/TestSALOMETraceCollector.py
index 0078e1d5a..9450cc62e 100644
--- 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-2024  CEA, EDF, 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 runSalome
+import sys, os,signal,string,subprocess
+import subprocess
+import runSalomeOld
 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
 
@@ -37,15 +40,18 @@ clt=orbmodule.client()
 
 # launch CORBA logger server
 
-myServer=runSalome.LoggerServer(args)
+myServer=runSalomeOld.LoggerServer(args)
 myServer.run()
 clt.waitLogger("Logger")
 
 # execute Unit Test
 
-command = ['TestSALOMETraceCollector']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+command = ['./TestSALOMETraceCollector']
+valgrind = ['valgrind', '--leak-check=full']
+#command = valgrind+command
+ret = subprocess.call(command)
 
-# kill Test process 
+# kill Test process
 
-TestKiller.killProcess(runSalome.process_id)
+TestKiller.killProcess(runSalomeOld.process_id)
+exit(ret)