Polish for emscripten.py and its tests.

5 files changed, 25 insertions, 8 deletions

diff --git a/tests/autoassemble.bc b/tests/autoassemble.bc
deleted file mode 100644
index 27a668c8..00000000
--- a/tests/autoassemble.bc
+++ /dev/null
diff --git a/tests/autoassemble.c b/tests/autoassemble.c
new file mode 100644
index 00000000..0619933c
--- /dev/null
+++ b/tests/autoassemble.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+  puts("test\n");
+  return 0;
+}
diff --git a/tests/unannotated.ll b/tests/cases/unannotated.ll
index 96ce5468..96ce5468 100644
--- a/tests/unannotated.ll
+++ b/tests/cases/unannotated.ll
diff --git a/tests/cases/unannotated.txt b/tests/cases/unannotated.txt
new file mode 100644
index 00000000..9daeafb9
--- /dev/null
+++ b/tests/cases/unannotated.txt
@@ -0,0 +1 @@
+test
diff --git a/tests/runner.py b/tests/runner.py
index 04856b8b..28abbfde 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -2673,15 +2673,25 @@ if 'benchmark' not in sys.argv:
         # This test *should* fail
         assert 'Assertion failed' in str(e), str(e)
 
-    def test_unannotated(self):
-      self.do_ll_test(path_from_root('tests', 'unannotated.ll'), 'test\n')
-
     def test_autoassemble(self):
-      filename = os.path.join(self.get_dir(), 'src.bc')
-      shutil.copy(path_from_root('tests', 'autoassemble.bc'), filename)
-      self.do_emscripten(filename, append_ext=False)
-      shutil.copy(filename + '.o.js', os.path.join(self.get_dir(), 'src.cpp.o.js'))
-      self.do_test(None, 'test\n', no_build=True)
+      src = r'''
+        #include <stdio.h>
+
+        int main() {
+          puts("test\n");
+          return 0;
+        }
+        '''
+      dirname = self.get_dir()
+      filename = os.path.join(dirname, 'src.cpp')
+      self.build(src, dirname, filename)
+
+      new_filename = os.path.join(dirname, 'new.bc')
+      shutil.copy(filename + '.o', new_filename)
+      self.do_emscripten(new_filename, append_ext=False)
+
+      shutil.copy(filename + '.o.js', os.path.join(self.get_dir(), 'new.cpp.o.js'))
+      self.do_test(None, 'test\n', basename='new.cpp', no_build=True)
 
     def test_dlmalloc_linked(self):
       src = open(path_from_root('tests', 'dlmalloc_test.c'), 'r').read()