diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2013-09-03 15:46:50 +0300 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-09-04 10:42:04 +0300 |
| commit | 3b170ade86c57f3f073438d9c91d59ec56b9ae73 (patch) | |
| tree | 3409c73ca1c672e9fe94f0c74429e621ebee9de0 | |
| parent | 14f7179b852f530d567afb5c6854b52b2d03d711 (diff) | |
Fix other.test_cmake when EM_BUILD_VERBOSE is not defined.
| -rw-r--r-- | tests/test_other.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_other.py b/tests/test_other.py index f763a302..dbaabd84 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -297,7 +297,7 @@ f.close() try: os.chdir(tempdirname) - verbose = int(os.getenv('EM_BUILD_VERBOSE')) != 0 + verbose = os.getenv('EM_BUILD_VERBOSE') != None and int(os.getenv('EM_BUILD_VERBOSE')) != 0 # Run Cmake cmd = ['cmake', '-DCMAKE_TOOLCHAIN_FILE='+path_from_root('cmake', 'Platform', 'Emscripten.cmake'), '-DCMAKE_BUILD_TYPE=' + configuration, @@ -313,7 +313,7 @@ f.close() assert os.path.exists(tempdirname + '/Makefile'), 'CMake call did not produce a Makefile!' # Build - cmd = [make_command] + ['VERBOSE=1'] if verbose else [] + cmd = [make_command] + (['VERBOSE=1'] if verbose else []) ret = Popen(cmd, stdout=None if verbose else PIPE).communicate() if len(ret) > 1 and ret[1] != None and len(ret[1].strip()) > 0: print >> sys.stderr, ret[1] # If there were any errors, print them directly to console for diagnostics. |