Changeset 5b993e0

Timestamp:

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

Author:

tdelisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, 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

Location:

tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• config.py.in (modified) (1 diff)
• pybin/settings.py (modified) (1 diff)
• pybin/tools.py (modified) (5 diffs)
• test.py (modified) (4 diffs)

tests/Makefile.am

@@ -28 +28 @@
 timeouts=
 
-TEST_PY = python ${builddir}/test.py
+TEST_PY = python3 ${builddir}/test.py
 
 # applies to both programs

tests/Makefile.in

@@ -360 +360 @@
 concurrent = 
 timeouts = 
-TEST_PY = python ${builddir}/test.py
+TEST_PY = python3 ${builddir}/test.py
 
 # applies to both programs

tests/config.py.in

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # encoding: utf-8
 """

tests/pybin/settings.py

@@ -1 @@
-from __future__ import print_function
-
 import os
 import sys
-import tools
+from . import tools
 
 try :

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)

tests/test.py

@@ -1 @@
-#!/usr/bin/python
-from __future__ import print_function
+#!/usr/bin/python3
 
 from pybin.tools import *
@@ -102 +101 @@
                 print('ERROR: invalid arguments', file=sys.stderr)
                 parser.print_help(sys.stderr)
-                sys.exit(1)
+                sys.exit(1)
 
         # script must have at least some tests to run or be listing
@@ -112 +111 @@
         # check that exactly one of the booleans is set to true
         if not sum( (listing, all_tests, some_tests, some_dirs) ) > 0 :
-                print('ERROR: must have option \'--all\', \'--list\', \'--include\', \'-I\' or non-empty test list', file=sys.stderr)
+                print('''ERROR: must have option '--all', '--list', '--include', '-I' or non-empty test list''', file=sys.stderr)
                 parser.print_help()
                 sys.exit(1)
@@ -281 +280 @@
         elif options.list :
                 print("Listing for %s:%s"% (settings.arch.string, settings.debug.string))
-                fancy_print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
+                fancy_print("\n".join(map(lambda t: t.toString(), tests)))
 
         else :