Add more error checking in nativize_llvm.py and its test code (emscripten-core#6408)

sbc100 · web-flow · commit e57fd75d5568 · 2018-04-02T09:32:56.000-07:00
This test doesn't on my linux box, but these changes at
least make it fail earlier so its more clear what is happening.
diff --git a/tests/test_other.py b/tests/test_other.py
@@ -2151,7 +2151,7 @@ def test_llvm_nativizer(self):
     open(os.path.join(self.get_dir(), 'test.file'), 'w').write('''ay file..............,,,,,,,,,,,,,,''')
     open(os.path.join(self.get_dir(), 'stdin'), 'w').write('''inter-active''')
     subprocess.check_call([PYTHON, EMCC, os.path.join(self.get_dir(), 'files.cpp'), '-c'])
-    run_process([PYTHON, path_from_root('tools', 'nativize_llvm.py'), os.path.join(self.get_dir(), 'files.o')], stdout=PIPE)
+    subprocess.check_call([PYTHON, path_from_root('tools', 'nativize_llvm.py'), os.path.join(self.get_dir(), 'files.o')])
     output = run_process([os.path.join(self.get_dir(), 'files.o.run')], stdin=open(os.path.join(self.get_dir(), 'stdin')), stdout=PIPE, stderr=PIPE)
     self.assertContained('''size: 37
 data: 119,97,107,97,32,119,97,107,97,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35
diff --git a/tools/nativize_llvm.py b/tools/nativize_llvm.py
@@ -1,17 +1,15 @@
 #!/usr/bin/env python2
-
-'''
-Small utility to build some llvm bitcode into native code. Useful when lli (called
-from exec_llvm) fails for some reason.
+"""Small utility to build some llvm bitcode into native code. Useful when lli
+(called from exec_llvm) fails for some reason.
 
  * Use llc to generate x86 asm
  * Use as to generate an object file
  * Use g++ to link it to an executable
-'''
+"""
 
 from __future__ import print_function
 import os, sys
-from subprocess import Popen, PIPE, STDOUT
+from subprocess import call, check_call, PIPE, STDOUT
 
 sys.path.insert(1, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -25,14 +23,14 @@ def path_from_root(*pathelems):
 libs = sys.argv[2:] # e.g.: dl for dlopen/dlclose, util for openpty/forkpty
 
 print('bc => clean bc')
-Popen([LLVM_OPT, filename, '-strip-debug', '-o', filename + '.clean.bc']).communicate()[0]
+check_call([LLVM_OPT, filename, '-strip-debug', '-o', filename + '.clean.bc'])
 print('bc => s')
 for params in [['-march=x86'], ['-march=x86-64']]: # try x86, then x86-64 FIXME
   print('params', params)
   for triple in [['-mtriple=i386-pc-linux-gnu'], []]:
-    Popen([LLVM_COMPILER] + params + triple + [filename + '.clean.bc', '-o', filename + '.s']).communicate()[0]
+    call([LLVM_COMPILER] + params + triple + [filename + '.clean.bc', '-o', filename + '.s'])
     print('s => o')
-    Popen(['as', filename + '.s', '-o', filename + '.o']).communicate()[0]
+    call(['as', filename + '.s', '-o', filename + '.o'])
     if os.path.exists(filename + '.o'): break
   if os.path.exists(filename + '.o'): break
 
@@ -41,5 +39,6 @@ def path_from_root(*pathelems):
   sys.exit(1)
 
 print('o => runnable')
-Popen(['g++', path_from_root('system', 'lib', 'debugging.cpp'), filename + '.o', '-o', filename + '.run'] + ['-l' + lib for lib in libs]).communicate()[0]
+check_call(['g++', path_from_root('system', 'lib', 'debugging.cpp'), filename + '.o', '-o', filename + '.run'] + ['-l' + lib for lib in libs])
 
+sys.exit(0)
