Merge remote-tracking branch 'rosslagerwall/python2'

This commit is contained in:
Nick Mathewson 2012-11-01 10:19:01 -04:00
commit b738ee189f
3 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python2
def get(old,wc,rc): def get(old,wc,rc):
if ('xxx' in (rc, wc)): if ('xxx' in (rc, wc)):

View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python2
# #
# Post-process the output of test-dumpevents and check it for correctness. # Post-process the output of test-dumpevents and check it for correctness.
# #

View File

@ -76,8 +76,8 @@ run_tests () {
fi fi
done done
announce_n " test-dumpevents: " announce_n " test-dumpevents: "
if python -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then if python2 -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then
if $TEST_DIR/test-dumpevents | python $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ; if $TEST_DIR/test-dumpevents | python2 $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
then then
announce OKAY ; announce OKAY ;
else else