From 665a7a9f4f8f93e8eda0ebec793cfc6a9b75790b Mon Sep 17 00:00:00 2001 From: Mikhail Maltsev Date: Fri, 4 Oct 2019 16:44:18 +0000 Subject: [PATCH] [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 llvm-svn: 373759 --- utils/bisect | 5 +++-- utils/bisect-skip-count | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/utils/bisect b/utils/bisect index 0f9e53afa7f..9df2cd9e113 100755 --- 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 f4f8ddcec79..efdd2c937e1 100755 --- 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: