Changes in src/tests/pybin/tools.py [552f5cb:ed45af6]

File:

• src/tests/pybin/tools.py (modified) (6 diffs)

src/tests/pybin/tools.py

@@ -9 +9 @@
 import stat
 import sys
-import fileinput
 
 from pybin import settings
@@ -34 +33 @@
                 out, err = proc.communicate()
                 return proc.returncode, out
-
-def is_ascii(fname):
-        if not os.path.isfile(fname):
-                return False
-
-        code, out = sh("file %s" % fname, print2stdout = False)
-        if code != 0:
-                return False
-
-        match = re.search(".*: (.*)", out)
-
-        if not match:
-                return False
-
-        return match.group(1) == "ASCII text"
 
 # Remove 1 or more files silently
@@ -121 +105 @@
 # helper function to replace patterns in a file
 def file_replace(fname, pat, s_after):
-        file = fileinput.FileInput(fname, inplace=True, backup='.bak')
-        for line in file:
-                print(line.replace(pat, s_after), end='')
-        file.close()
+    # first, see if the pattern is even in the file.
+    with open(fname) as f:
+        if not any(re.search(pat, line) for line in f):
+            return # pattern does not occur in file so we are done.
+
+    # pattern is in the file, so perform replace operation.
+    with open(fname) as f:
+        out_fname = fname + ".tmp"
+        out = open(out_fname, "w")
+        for line in f:
+            out.write(re.sub(pat, s_after, line))
+        out.close()
+        os.rename(out_fname, fname)
 
 # helper function to check if a files contains only a specific string
@@ -147 +140 @@
 # transform path to canonical form
 def canonicalPath(path):
-        abspath = os.path.abspath(__main__.__file__)
-        dname = os.path.dirname(abspath)
-        return os.path.join(dname, os.path.normpath(path) )
+        return os.path.join('.', os.path.normpath(path) )
 
 # compare path even if form is different
@@ -160 +151 @@
                 for name in names:
                         path = os.path.join(dirname, name)
+
                         op( path )
 
         # Start the walk
-        abspath = os.path.abspath(__main__.__file__)
-        dname = os.path.dirname(abspath)
-        os.path.walk(dname, step, '')
+        os.path.walk('.', step, '')
 
 ################################################################################
 #               system
 ################################################################################
+
+# parses the Makefile to find the machine type (32-bit / 64-bit)
+def getMachineType():
+        sh('echo "void ?{}(int&a,int b){}int main(){return 0;}" > .dummy.c')
+        ret, out = make('.dummy', silent = True)
+
+        if ret != 0:
+                print("Failed to identify architecture:")
+                print(out)
+                print("Stopping")
+                rm( (".dummy.c",".dummy") )
+                sys.exit(1)
+
+        _, out = sh("file .dummy", print2stdout=False)
+        rm( (".dummy.c",".dummy") )
+
+        if settings.dry_run :
+                return 'x64'
+
+        return re.search(r"[^,]+,([^,]+),", out).group(1).strip()
+
 # count number of jobs to create
 def jobCount( options, tests ):
@@ -233 +244 @@
         else:
                 print(text)
+
+settings.set_machine_default( getMachineType )