diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2013-08-21 16:31:44 +0300 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-08-30 14:44:52 +0300 |
| commit | 3f37ff4332eb24d75eb62a628cb2bd0949842acf (patch) | |
| tree | 662025a2d1f49794136b50b98c3fe63479d4d75a /tools | |
| parent | 15f4ad9b5ba8095ce1596f8733f03ff39030cd79 (diff) | |
Remove Building.configure() from storing stdout and stderr output to a temp file, since these temp files aren't read from anywhere in emscripten codebase(?). In test suite the temp files are stored to a temp dir, and deleted immediately after the test is run. This prevented test suite from reporting build errors to user when the test fails. Related to #694, #695 and #696. Improve error message reporting at the end of a failed configure run.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index 3ee5db23..13958d52 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -843,6 +843,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e raise del env['EMMAKEN_JUST_CONFIGURE'] if process.returncode is not 0: + logging.error('Configure step failed with non-zero return code ' + str(process.returncode) + '! Command line: ' + str(args)) raise subprocess.CalledProcessError(cmd=args, returncode=process.returncode) @staticmethod @@ -897,8 +898,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e env[k] = v if configure: # Useful in debugging sometimes to comment this out (and the lines below up to and including the |link| call) try: - Building.configure(configure + configure_args, stdout=open(os.path.join(project_dir, 'configure_'), 'w'), - stderr=open(os.path.join(project_dir, 'configure_err'), 'w'), env=env) + Building.configure(configure + configure_args, env=env) except subprocess.CalledProcessError, e: pass # Ignore exit code != 0 def open_make_out(i, mode='r'): |