Skip to content

[clang][utils] Make CmpDriver Python3 compatible #163740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2025
Merged

[clang][utils] Make CmpDriver Python3 compatible #163740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 32 additions & 31 deletions clang/utils/CmpDriver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ A simple utility that compares tool invocations and exit codes issued by
compiler drivers that support -### (e.g. gcc and clang).
"""

from itertools import zip_longest
import subprocess

def splitArgs(s):
Expand All @@ -22,7 +23,7 @@ def splitArgs(s):
elif inQuote:
if c == '\\':
current += c
current += it.next()
current += next(it)
else:
current += c
elif not c.isspace():
Expand Down Expand Up @@ -135,77 +136,77 @@ def main():

# Compare stdout.
if infoA.stdout != infoB.stdout:
print '-- STDOUT DIFFERS -'
print 'A OUTPUT: ',infoA.stdout
print 'B OUTPUT: ',infoB.stdout
print
print('-- STDOUT DIFFERS -')
print('A OUTPUT: ',infoA.stdout)
print('B OUTPUT: ',infoB.stdout)
print()

diff = ZipperDiff(infoA.stdout.split('\n'),
infoB.stdout.split('\n'))
for i,(aElt,bElt) in enumerate(diff.getDiffs()):
if aElt is None:
print 'A missing: %s' % bElt
print('A missing: %s' % bElt)
elif bElt is None:
print 'B missing: %s' % aElt
print('B missing: %s' % aElt)
else:
print 'mismatch: A: %s' % aElt
print ' B: %s' % bElt
print('mismatch: A: %s' % aElt)
print(' B: %s' % bElt)

differ = True

# Compare stderr.
if infoA.stderr != infoB.stderr:
print '-- STDERR DIFFERS -'
print 'A STDERR: ',infoA.stderr
print 'B STDERR: ',infoB.stderr
print
print('-- STDERR DIFFERS -')
print('A STDERR: ',infoA.stderr)
print('B STDERR: ',infoB.stderr)
print()

diff = ZipperDiff(infoA.stderr.split('\n'),
infoB.stderr.split('\n'))
for i,(aElt,bElt) in enumerate(diff.getDiffs()):
if aElt is None:
print 'A missing: %s' % bElt
print('A missing: %s' % bElt)
elif bElt is None:
print 'B missing: %s' % aElt
print('B missing: %s' % aElt)
else:
print 'mismatch: A: %s' % aElt
print ' B: %s' % bElt
print('mismatch: A: %s' % aElt)
print(' B: %s' % bElt)

differ = True

# Compare commands.
for i,(a,b) in enumerate(map(None, infoA.commands, infoB.commands)):
for i,(a,b) in enumerate(zip_longest(infoA.commands, infoB.commands, fillvalue=None)):
if a is None:
print 'A MISSING:',' '.join(b)
print('A MISSING:',' '.join(b))
differ = True
continue
elif b is None:
print 'B MISSING:',' '.join(a)
print('B MISSING:',' '.join(a))
differ = True
continue

diff = DriverZipperDiff(a,b)
diffs = list(diff.getDiffs())
if diffs:
print '-- COMMAND %d DIFFERS -' % i
print 'A COMMAND:',' '.join(a)
print 'B COMMAND:',' '.join(b)
print
print('-- COMMAND %d DIFFERS -' % i)
print('A COMMAND:',' '.join(a))
print('B COMMAND:',' '.join(b))
print()
for i,(aElt,bElt) in enumerate(diffs):
if aElt is None:
print 'A missing: %s' % bElt
print('A missing: %s' % bElt)
elif bElt is None:
print 'B missing: %s' % aElt
print('B missing: %s' % aElt)
else:
print 'mismatch: A: %s' % aElt
print ' B: %s' % bElt
print('mismatch: A: %s' % aElt)
print(' B: %s' % bElt)
differ = True

# Compare result codes.
if infoA.exitCode != infoB.exitCode:
print '-- EXIT CODES DIFFER -'
print 'A: ',infoA.exitCode
print 'B: ',infoB.exitCode
print('-- EXIT CODES DIFFER -')
print('A: ',infoA.exitCode)
print('B: ',infoB.exitCode)
differ = True

if differ:
Expand Down