Changeset 5b993e0 for tests/pybin/tools.py

Timestamp:

Mar 25, 2019, 12:05:29 PM (4 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d3c1c6a

Parents:

d4a60ac

Message:

Updated test scripts to use python3

File:

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

tests/pybin/tools.py

@@ -1 @@
-from __future__ import print_function
-
 import __main__
 import argparse
@@ -12 +10 @@
 import sys
 import time
+import types
 
 from pybin import settings
@@ -58 +57 @@
 # Remove 1 or more files silently
 def rm( files ):
-        if isinstance( files, basestring ):
-                sh("rm -f %s > /dev/null 2>&1" % files )
-        else:
-                for file in files:
-                        sh("rm -f %s > /dev/null 2>&1" % file )
+        if isinstance(files, str ): files = [ files ]
+        for file in files:
+                sh("rm -f %s > /dev/null 2>&1" % file )
 
 # Create 1 or more directory
 def mkdir( files ):
-        if isinstance( files, basestring ):
-                sh("mkdir -p %s" % os.path.dirname(files) )
-        else:
-                for file in files:
-                        sh("mkdir -p %s" % os.path.dirname(file) )
+        if isinstance(files, str ): files = [ files ]
+        for file in files:
+                p = os.path.normpath( file )
+                d = os.path.dirname ( p )
+                sh( "mkdir -p {}".format(d) )
 
 
@@ -200 +197 @@
         # Start the walk
         dname = settings.SRCDIR
-        os.path.walk(dname, step, '')
+        for dirname, _, names in os.walk(dname):
+                for name in names:
+                        path = os.path.join(dirname, name)
+                        op( path )
 
 ################################################################################
@@ -268 +268 @@
                 cmd = "%s 2> /dev/null" % column
                 proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
-                proc.communicate(input=text + "\n")
+                proc.communicate(input=bytes(text + "\n", "UTF-8"))
         else:
                 print(text)