Changes in tests/pybin/tools.py [0c13238:202ad72]

File:

• tests/pybin/tools.py (modified) (5 diffs)

tests/pybin/tools.py

@@ -3 +3 @@
 import __main__
 import argparse
-import fileinput
 import multiprocessing
 import os
 import re
-import resource
 import signal
 import stat
 import sys
-import time
+import fileinput
 
 from pybin import settings
@@ -81 +79 @@
 def diff( lhs, rhs ):
         # diff the output of the files
-        diff_cmd = ("diff --text "
-#                               "--ignore-all-space "
-#                               "--ignore-blank-lines "
+        diff_cmd = ("diff --ignore-all-space --text "
+                                "--ignore-blank-lines "
                                 "--old-group-format='\t\tmissing lines :\n"
                                 "%%<' \\\n"
@@ -133 +130 @@
 
     return None
-
-def run(exe, output, input):
-        ret, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe, output), input = input)
-        return ret
-
 ################################################################################
 #               file handling
 ################################################################################
-# move a file
-def mv(source, dest):
-        ret, _ = sh("mv %s %s" % (source, dest))
-        return ret
-
-# cat one file into the other
-def cat(source, dest):
-        ret, _ = sh("cat %s > %s" % (source, dest))
-        return ret
 
 # helper function to replace patterns in a file
@@ -246 +229 @@
                 signal.signal(signal.SIGINT, signal.SIG_IGN)
 
-
-# enable core dumps for all the test children
-resource.setrlimit(resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY))
-
 ################################################################################
 #               misc
@@ -267 +246 @@
         if column:
                 cmd = "%s 2> /dev/null" % column
+                print(cmd)
                 proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
-                proc.communicate(input=text + "\n")
+                proc.communicate(input=text)
         else:
                 print(text)
-
-
-def coreInfo(path):
-        cmd   = os.path.join(settings.SRCDIR, "pybin/print-core.gdb")
-        if not os.path.isfile(cmd):
-                return 1, "ERR Printing format for core dumps not found"
-
-        dname = os.path.dirname(path)
-        core  = os.path.join(dname, "core" )
-        if not os.path.isfile(path):
-                return 1, "ERR Executable path is wrong"
-
-        if not os.path.isfile(core):
-                return 1, "ERR No core dump"
-
-        return sh("gdb -n %s %s -batch -x %s" % (path, core, cmd), print2stdout=False)
-
-class Timed:
-    def __enter__(self):
-        self.start = time.time()
-        return self
-
-    def __exit__(self, *args):
-        self.end = time.time()
-        self.duration = self.end - self.start