-# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2015-2017 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# Run test
def runTest(command):
print "Running:", " ".join(command)
- p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- out, err = p.communicate()
+ p = subprocess.Popen(command)
+ p.communicate()
res = p.returncode
# About res value:
# A negative value -N indicates that the child was terminated by signal N (Unix only).
# On Unix, the value 11 generally corresponds to a segmentation fault.
- return res, out, err
-#
-
-# Display output and errors
-def processResult(res, out, err):
- if out:
- print out
- pass
- if err:
- print " ** Detected error **"
- print "Error code: ", res
- print err,
- print " ** end of message **"
- pass
return res
#
# first argument
if not args:
print "Invalid arguments for salome_test_driver.py. No command defined."
- exit(1)
+ sys.exit(1)
_, ext = os.path.splitext(args[0])
if ext == ".py":
test_and_args = [sys.executable] + args
try:
salome_instance = SalomeInstance.start(shutdown_servers=True)
port = salome_instance.get_port()
- res, out, err = runTest(test_and_args)
- res = processResult(res, out, err)
+ res = runTest(test_and_args)
except TimeoutException:
print "FAILED : timeout(%s) is reached"%timeout_delay
except:
import traceback
traceback.print_exc()
pass
-
- salome_instance.stop()
+ try:
+ salome_instance.stop()
+ except:
+ pass
if sys.platform == 'win32':
timer.cancel()
print "Exit test with status code:", res
- exit(res)
+ sys.exit(res)
#