Add missing methods to the client interface of SObject.

[modules/kernel.git] / bin / runTests.py

diff --git a/bin/runTests.py b/bin/runTests.py
index 7384e8554b06ef24e396013291427a50b02cc136..2ea2fce2ca93d3c97fed409ed8b4eb9bbdd03b8a 100644 (file)
--- a/bin/runTests.py
+++ b/bin/runTests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 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
@@ -22,7 +22,9 @@ import sys
 import select
 import subprocess
 
-def __configureTests(args=[], exe=None):
+def __configureTests(args=None, exe=None):
+  if args is None:
+    args = []
   if exe:
       usage = "Usage: %s [options]"%exe
   else:
@@ -33,6 +35,10 @@ Principal options are:
     -h,--help
         Show this help message and exit.
 
+    --print-labels
+        Print the list of all labels associated with the test set.
+        This option will not run any tests.
+
     -V,--verbose
         Enable verbose output from tests.
     -VV,--extra-verbose
@@ -68,36 +74,6 @@ For complete description of available options, pleaser refer to ctest documentat
 # tests must be in ${ABSOLUTE_APPLI_PATH}/${__testSubDir}/
 __testSubDir = "bin/salome/test"
 
-# Both display process stdout&stderr to console and capture them to variables
-def __runTest(command, workdir):
-  p = subprocess.Popen(command, cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=1)
-  stdout = []
-  stderr = []
-
-  while True:
-    reads = [p.stdout.fileno(), p.stderr.fileno()]
-    ret = select.select(reads, [], [])
-
-    for fd in ret[0]:
-      if fd == p.stdout.fileno():
-        read = p.stdout.readline()
-        sys.stdout.write(read)
-        stdout.append(read)
-        pass
-      if fd == p.stderr.fileno():
-        read = p.stderr.readline()
-        sys.stderr.write(read)
-        stderr.append(read)
-        pass
-      pass
-
-    if p.poll() != None:
-      break
-    pass
-
-  return p.returncode, "".join(stdout), "".join(stderr)
-#
-
 def runTests(args, exe=None):
   args = __configureTests(args, exe)
 
@@ -108,7 +84,7 @@ def runTests(args, exe=None):
   testPath = os.path.join(appliPath, __testSubDir)
 
   command = ["ctest"] + args
-  res, out, err = __runTest(command, testPath)
-
-  sys.exit(res)
+  p = subprocess.Popen(command, cwd=testPath)
+  p.communicate()
+  return p.returncode
 #