summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-08-20 15:03:23 (GMT)
committerGitHub <noreply@github.com>2018-08-20 15:03:23 (GMT)
commit629d36ed43347f4dc572475921ae87e413c1f89b (patch)
tree499b81cbd826fd74c1e9df6c9a64740ce2f31a6c
parent4b2c725594df59cb672ff8b1c2701a64c2e5800c (diff)
parent6719b7292b7bd42d9e8e62391134a2e3d10001bf (diff)
downloadSCons-629d36ed43347f4dc572475921ae87e413c1f89b.zip
SCons-629d36ed43347f4dc572475921ae87e413c1f89b.tar.gz
SCons-629d36ed43347f4dc572475921ae87e413c1f89b.tar.bz2
Merge pull request #3180 from bdbaddog/update_nasm_test_to_run
Fix bytes->string decoding issue as subprocess returned stdout is bytes in py3 [ci skip]
-rw-r--r--test/AS/nasm.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/AS/nasm.py b/test/AS/nasm.py
index 4d57951..4d93c7f 100644
--- a/test/AS/nasm.py
+++ b/test/AS/nasm.py
@@ -52,6 +52,7 @@ try:
except OSError:
test.skip_test('could not determine nasm version; skipping test\n')
else:
+ stdout = stdout.decode()
version = stdout.split()[2].split('.')
if int(version[0]) ==0 and int(version[1]) < 98:
test.skip_test("skipping test of nasm version %s\n" % version)