[utils] Fix incompatibility of bisect[-skip-count] with Python 3

Summary:
This change replaces the print statements with print function calls
and also replaces the '/' operator (which is integer division in Py2,
but becomes floating point division in Py3) with the '//' operator
which has the same semantics in Py2 and Py3.

Reviewers: greened, michaelplatings, gottesmm

Reviewed By: greened

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D68138

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@373759 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/bisect b/utils/bisect
index 0f9e53afa7f4a195faccfe0e5f1bfc88fc44d22b..9df2cd9e1136bc9fedbf3c57f449854346d45d5e 100755 (executable)
--- a/utils/bisect
+++ b/utils/bisect
@@ -12,6 +12,7 @@
 # And bisect will continually call ./script.sh with various counts using
 # the exit status to determine success and failure.
 #
+from __future__ import print_function
 import os
 import sys
 import argparse
@@ -34,10 +35,10 @@ print("End: %d" % end)
 
 last = None
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Count: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'count':count} for x in args.command]
-    print cmd
+    print(cmd)
     result = subprocess.call(cmd)
     if result == 0:
         print("    PASSES! Setting start to count")

diff --git a/utils/bisect-skip-count b/utils/bisect-skip-count
index f4f8ddcec797ad2ad5f109a8020c109bbaad4279..efdd2c937e1529656bee809f75053ef0228316a1 100755 (executable)
--- a/utils/bisect-skip-count
+++ b/utils/bisect-skip-count
@@ -20,6 +20,7 @@
 # result.  Incrementing the last good count by one or decrementing the
 # last good skip by one should produce a failure.
 #
+from __future__ import print_function
 import os
 import sys
 import argparse
@@ -52,10 +53,10 @@ print("End: %d" % end)
 
 last = None
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Skip: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'skip':count, 'count':-1} for x in args.command]
-    print cmd
+    print(cmd)
     try:
         result = subprocess.call(cmd, shell=args.shell, timeout=args.timeout)
         if result == 0:
@@ -75,10 +76,10 @@ print("Bisect of Count starting!")
 print("Start: %d" % start)
 print("End: %d" % end)
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Count: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'count':count, 'skip':firstcount } for x in args.command]
-    print cmd
+    print(cmd)
     try:
         result = subprocess.call(cmd, shell=args.shell, timeout=args.timeout)
         if result == 0: