Changeset 91788fa for src/tests/pybin

Timestamp:

Jul 25, 2018, 6:23:58 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

a95c117, f0b3f51

Parents:

40a7d9c (diff), e89f4b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/tests/pybin

Files:

• settings.py (modified) (4 diffs)
• test_run.py (modified) (2 diffs)
• tools.py (modified) (6 diffs)

src/tests/pybin/settings.py

@@ +1 @@
+from __future__ import print_function
+
+import os
 import sys
+
+try :
+        sys.path.append(os.getcwd())
+        import config
+
+        SRCDIR = os.path.abspath(config.SRCDIR)
+        BUILDDIR = os.path.abspath(config.BUILDDIR)
+except:
+        print('ERROR: missing config.py, re-run configure script.', file=sys.stderr)
+        sys.exit(1)
 
 class Architecture:
@@ -5 +18 @@
                 'x64'                   : 'x64',
                 'x86-64'                : 'x64',
+                'x86_64'                : 'x64',
                 'x86'                   : 'x86',
                 'i386'          : 'x86',
@@ -25 +39 @@
                         self.cross_compile = False
                         try:
-                                arch = machine_default()
+                                arch = config.HOSTARCH
                                 self.target = Architecture.makeCanonical( arch )
                         except KeyError:
@@ -66 +80 @@
         arch       = Architecture(options.arch)
 
+
 def updateMakeCmd(force, jobs):
         global make
 
         make = "make" if not force else ("make -j%i" % jobs)
-
-
-def set_machine_default( func ):
-        global machine_default
-
-        machine_default = func

src/tests/pybin/test_run.py

@@ -33 +33 @@
 
         def expect(self):
-                return ("%s/.expect/%s%s.txt" % (self.path, self.name, '' if not self.arch else ".%s" % self.arch))
+                return ("%s.expect/%s%s.txt" % (os.path.join(settings.SRCDIR, self.path), self.name, '' if not self.arch else ".%s" % self.arch))
 
         def error_log(self):
-                return ("%s/.err/%s.log"    % (self.path, self.name))
+                return ("%s.err/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
 
         def output_log(self):
-                return ("%s/.out/%s.log"    % (self.path, self.name))
+                return ("%s.out/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
 
         def input(self):
-                return ("%s/.in/%s.txt"     % (self.path, self.name))
+                return ("%s.in/%s.txt"     % (os.path.join(settings.SRCDIR, self.path), self.name))
 
         def target_output(self):
@@ -49 +49 @@
         def target(self):
                 return os.path.join(self.path, self.name)
+
+        def target_executable(self):
+                return os.path.join(settings.BUILDDIR, self.path, self.name)
 
         @classmethod

src/tests/pybin/tools.py

@@ -9 +9 @@
 import stat
 import sys
+import fileinput
 
 from pybin import settings
@@ -33 +34 @@
                 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
@@ -105 +121 @@
 # helper function to replace patterns in a file
 def file_replace(fname, pat, s_after):
-    # 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)
+        file = fileinput.FileInput(fname, inplace=True, backup='.bak')
+        for line in file:
+                print(line.replace(pat, s_after), end='')
+        file.close()
 
 # helper function to check if a files contains only a specific string
@@ -140 +147 @@
 # transform path to canonical form
 def canonicalPath(path):
-        return os.path.join('.', os.path.normpath(path) )
+        abspath = os.path.abspath(__main__.__file__)
+        dname = os.path.dirname(abspath)
+        return os.path.join(dname, os.path.normpath(path) )
 
 # compare path even if form is different
@@ -151 +160 @@
                 for name in names:
                         path = os.path.join(dirname, name)
-
                         op( path )
 
         # Start the walk
-        os.path.walk('.', step, '')
+        abspath = os.path.abspath(__main__.__file__)
+        dname = os.path.dirname(abspath)
+        os.path.walk(dname, 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 ):
@@ -244 +233 @@
         else:
                 print(text)
-
-settings.set_machine_default( getMachineType )