tesh.py: if there is a wrapper, increase the timeout value

[simgrid.git] / tools / tesh / tesh.py

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index ef69904..4a635be 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -1,22 +1,38 @@
-#!/usr/bin/env python
+#! @PYTHON_EXECUTABLE@
 # -*- coding: utf-8 -*-
 """
 
 tesh -- testing shell
 ========================
 
-Copyright (c) 2012-2015. The SimGrid Team.
+Copyright (c) 2012-2016. The SimGrid Team.
 All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the license (GNU LGPL) which comes with this package.
 
-#TODO: <glesserd> emptty: does "! output display" also disable the comparaison with the output ?  yes
 
-#TODO: child of child of child printf => tester dans rsg...
+#TODO: child of child of child that printfs. Does it work?
+#TODO: a child dies after its parent. What happen?
 
 #TODO: regular expression in output
+#ex: >> Time taken: [0-9]+s
 #TODO: linked regular expression in output
+#ex:
+# >> Bytes sent: ([0-9]+)
+# >> Bytes recv: \1
+# then, even better:
+# ! expect (\1 > 500)
+
+# TODO: If the output is sorted, we should report it to the users. Corresponding perl chunk
+# print "WARNING: Both the observed output and expected output were sorted as requested.\n";
+# print "WARNING: Output were only sorted using the $sort_prefix first chars.\n"
+#    if ( $sort_prefix > 0 );
+# print "WARNING: Use <! output sort 19> to sort by simulated date and process ID only.\n";
+#    
+# print "----8<---------------  Begin of unprocessed observed output (as it should appear in file):\n";
+# map {print "> $_\n"} @{$cmd{'unsorted got'}};
+# print "--------------->8----  End of the unprocessed observed output.\n";
 
 
 """
@@ -32,11 +48,8 @@ import argparse
 if sys.version_info[0] == 3:
     import subprocess
     import _thread
-elif sys.version_info[0] < 3:
-    import subprocess32 as subprocess
-    import thread as _thread
 else:
-    raise "This program has not been made to exist this long"
+    raise "This program is expected to run with Python3 only"
 
 
 
@@ -158,9 +171,6 @@ class TeshState(Singleton):
             t.acquire()
             t.release()
 
-
-
-
 #Command line object
 class Cmd(object):
     def __init__(self):
@@ -273,10 +283,13 @@ class Cmd(object):
             if lock is not None: lock.release()
             return
         
-        self.args += TeshState().args_suffix
+        self.args = TeshState().wrapper + self.args + TeshState().args_suffix
         
         print("["+FileReader().filename+":"+str(self.linenumber)+"] "+self.args)
         
+        if TeshState().wrapper is not None:
+            self.timeout *= 20
+        
         args = shlex.split(self.args)
         #print (args)
         try:
@@ -349,12 +362,6 @@ class Cmd(object):
 
 
 
-
-
-
-
-
-
 ##############
 #
 # Main
@@ -373,6 +380,7 @@ if __name__ == '__main__':
     group1.add_argument('--cfg', metavar='arg', help='add parameter --cfg=arg to each command line')
     group1.add_argument('--log', metavar='arg', help='add parameter --log=arg to each command line')
     group1.add_argument('--enable-coverage', action='store_true', help='ignore output lines starting with "profiling:"')
+    group1.add_argument('--wrapper', metavar='arg', help='Run each command in the provided wrapper (eg valgrind)')
 
     try:
         options = parser.parse_args()
@@ -401,7 +409,9 @@ if __name__ == '__main__':
         TeshState().args_suffix += " --cfg="+options.cfg
     if options.log is not None:
         TeshState().args_suffix += " --log="+options.log
-    
+
+    if options.wrapper is not None:
+        TeshState().wrapper = options.wrapper
     
     #cmd holds the current command line
     # tech commands will add some parameters to it
@@ -492,8 +502,3 @@ if __name__ == '__main__':
         print("Test suite from stdin OK")
     else:
         print("Test suite `"+f.filename+"' OK")
-
-
-
-
-