From 29fad4dc6bd49b9e774cb4186da447267bd7c7ba Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Aguerre?= <cedric.aguerre@edf.fr>
Date: Fri, 20 Mar 2015 17:05:31 +0100
Subject: [PATCH] temp tricky for PVIS

print test status code
---
 .../salome_tester/salome_test_driver.py       | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/bin/appliskel/salome_tester/salome_test_driver.py b/bin/appliskel/salome_tester/salome_test_driver.py
index 2587881ce..92e93dfb2 100644
--- a/bin/appliskel/salome_tester/salome_test_driver.py
+++ b/bin/appliskel/salome_tester/salome_test_driver.py
@@ -36,6 +36,35 @@ def runTest(command):
   return res, out, err
 #
 
+def processResultSpecialParavis(res, out, err):
+  # :TRICKY: Special case of returncode=127
+  # When using paraview in SALOME environment, the following error
+  # systematically appears when exiting paraview (it's also true when using
+  # PARAVIS and exiting SALOME):
+  # Inconsistency detected by ld.so: dl-close.c: 738: _dl_close: Assertion `map->l_init_called' failed!
+  # For PARAVIS tests purpose, paraview functionalities are accessed in each
+  # test; these tests are run in the above subprocess call.
+  # The assertion error implies a subprocess return code of 127, and the test
+  # status is considered as "failed".
+  # The tricky part here is to discard such return codes, waiting for a fix
+  # maybe in paraview...
+  if res == 127 and err.startswith("Inconsistency detected by ld.so: dl-close.c"):
+      print "    ** THE FOLLOWING MESSAGE IS DISCARDED WHEN ANALYZING TEST SUCCESSFULNESS **"
+      print err,
+      print "    ** end of message **"
+      res = 0
+  elif err:
+      print "    ** Detected error **"
+      print "Error code: ", res
+      print err,
+      print "    ** end of message **"
+      pass
+
+  if out:
+      print out
+  return res
+#
+
 # Display output and errors
 def processResult(res, out, err):
   if out:
@@ -44,6 +73,7 @@ def processResult(res, out, err):
   if err:
     print err
   print "Status code: ", res
+  return res
 #
 
 # Timeout management
@@ -84,7 +114,8 @@ if __name__ == "__main__":
   try:
     port = startSession()
     res, out, err = runTest(test_and_args)
-    processResult(res, out, err)
+    #res = processResult(res, out, err)
+    res = processResultSpecialParavis(res, out, err)
   except TimeoutException:
     print "FAILED : timeout(%s) is reached"%timeout_delay
   except:
@@ -93,5 +124,6 @@ if __name__ == "__main__":
     pass
 
   terminateSession(port)
+  print "Exit test with status code:", res
   exit(res)
 #
-- 
2.39.2