Skip to content

Commit 34491d8

Browse files
committed
fix to the argparser, plus clean up of @abakst's fix, plus hall of fame, and picking a new fight with travis.
1 parent a36c9e7 commit 34491d8

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install:
3030
# command to run tests
3131
script:
3232
# # Run unittests
33-
# - python -m unittest discover test/ || exit 1
33+
- python -m unittest discover test/ || exit 1
3434
- export WLLVM_HOME=`pwd`
3535
- ${WLLVM_HOME}/.travis/store.sh
3636
- export APACHE_VER=2.4.18

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
description='Whole Program LLVM',
2121
long_description=long_description,
2222
url='https://github.com/SRI-CSL/whole-program-llvm',
23-
author='Ian A. Mason, Tristan Ravitch, Dan Liew, Bruno Dutertre, Benjamin Schubert, Berkeley Churchill, Marko Dimjasevic, Will Dietz, Fabian Mager, Ben Liblit, Andrew Santosa, Tomas Kalibera, Loic Gelle, Joshua Cranmer.',
23+
author='Ian A. Mason, Tristan Ravitch, Dan Liew, Bruno Dutertre, Benjamin Schubert, Berkeley Churchill, Marko Dimjasevic, Will Dietz, Fabian Mager, Ben Liblit, Andrew Santosa, Tomas Kalibera, Loic Gelle, Joshua Cranmer, Alexander Bakst.',
2424
author_email='iam@csl.sri.com',
2525

2626

wllvm/arglistfilter.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
242242
r'^-std=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
243243
r'^-stdlib=.+$' : (0, ArgumentListFilter.compileLinkUnaryCallback),
244244
r'^-mtune=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
245+
#iam: mac stuff...
246+
r'-mmacosx-version-min=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
247+
248+
245249
r'^--sysroot=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
246250
r'^-print-prog-name=.*$' : (0, ArgumentListFilter.compileUnaryCallback),
247251
r'^-print-file-name=.*$' : (0, ArgumentListFilter.compileUnaryCallback),

wllvm/extraction.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,12 @@ def extract_section_darwin(inputFile):
125125
try:
126126
octets = []
127127
for line in lines[1:]:
128-
# m = otool_hexdata.match(line)
129128
m = otool_hexdata.match(line.decode())
130129
if not m:
131130
_logger.debug('otool output:\n\t%s\nDID NOT match expectations.', line)
132131
continue
133132
octetline = m.group(1)
134133
octets.extend(octetline.split())
135-
# retval = ''.join(octets).decode('hex').splitlines()
136134
retval = decode_hex(''.join(octets))[0].splitlines()
137135
if not retval:
138136
_logger.error('%s contained no %s segment', inputFile, darwinSegmentName)

0 commit comments

Comments
 (0)