diff options
| -rwxr-xr-x | emcc | 3 | ||||
| -rwxr-xr-x | tests/runner.py | 9 |
2 files changed, 4 insertions, 8 deletions
@@ -776,7 +776,8 @@ try: else: print >> sys.stderr, 'emcc: %s: warning: Not valid LLVM bitcode' % arg else: - print >> sys.stderr, 'emcc: %s: warning: No such file or directory' % arg + print >> sys.stderr, 'emcc: %s: error: No such file or directory' % arg + exit(1) elif arg.startswith('-L'): lib_dirs.append(arg[2:]) newargs[i] = '' diff --git a/tests/runner.py b/tests/runner.py index 09fd7d49..30e0e9c8 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -7711,14 +7711,9 @@ f.close() shutil.rmtree(tempdirname) def test_failure_error_code(self): + for compiler in [EMCC, EMXX]: # Test that if one file is missing from the build, then emcc shouldn't succeed, and shouldn't try to produce an output file. - process = Popen(['python', EMCC, path_from_root('tests', 'hello_world.c'), 'this_file_is_missing.c', '-o', 'this_output_file_should_never_exist.js'], stdout=PIPE, stderr=PIPE) - process.communicate() - assert process.returncode is not 0, 'Trying to compile a nonexisting file should return with a nonzero error code!' - assert os.path.exists('this_output_file_should_never_exist.js') == False, 'Emcc should not produce an output file when build fails!' - - # Same goes for em++ - process = Popen(['python', EMXX, path_from_root('tests', 'hello_world.cpp'), 'this_file_is_missing.cpp', '-o', 'this_output_file_should_never_exist.js'], stdout=PIPE, stderr=PIPE) + process = Popen(['python', compiler, path_from_root('tests', 'hello_world.c'), 'this_file_is_missing.c', '-o', 'this_output_file_should_never_exist.js'], stdout=PIPE, stderr=PIPE) process.communicate() assert process.returncode is not 0, 'Trying to compile a nonexisting file should return with a nonzero error code!' assert os.path.exists('this_output_file_should_never_exist.js') == False, 'Emcc should not produce an output file when build fails!' |