support a (js) target when emcc is given two input files

2 files changed, 14 insertions, 11 deletions

diff --git a/emcc b/emcc
index dad157a9..6c7f3079 100755
--- a/emcc
+++ b/emcc
@@ -300,7 +300,6 @@ elif use_compiler:
 
   specified_target = target
   target = specified_target if specified_target is not None else 'a.out.js' # specified_target is the user-specified one, target is what we will generate
-  if specified_target: assert len(input_files) == 1, 'If a target is specified, there should be exactly one input file'
 
   target_basename = unsuffixed_basename(target)
 
@@ -344,6 +343,7 @@ elif use_compiler:
         shutil.move(input_file + '.o', input_file + '.bc')
 
     if specified_target:
+      assert len(input_files) == 1, 'If a target is specified, and we are compiling to bitcode, there should be exactly one input file (c.f. gcc for why)'
       shutil.move(input_files[0] + '.' + final_suffix, unsuffixed_basename(specified_target) + '.' + final_suffix)
 
     exit(0)
diff --git a/tests/runner.py b/tests/runner.py
index a41a0d27..1ad9f603 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -4962,16 +4962,19 @@ Options that are modified or new in %s include:
           self.assertContained('hello, world!', run_js('a.out.js'))
           assert test(open('a.out.js').read()), text
 
-        ## Compiling two source files TODO: with -o
-        #clear()
-        #output = Popen([compiler, path_from_root('tests', 'twopart_main.cpp'), path_from_root('tests', 'twopart_side.cpp')],
-        #               stdout=PIPE, stderr=PIPE).communicate()
-        #assert len(output[0]) == 0, output[0]
-        #assert os.path.exists('a.out.js'), '\n'.join(output)
-        #self.assertContained('side got: hello from main, over', run_js('a.out.js'))
-        ##assert os.path.exists('twopart_main.bc'), '\n'.join(output)
-        ##assert os.path.exists('twopart_side.bc'), '\n'.join(output)
-        ##output = Popen([compiler, 'twopart_main.bc', 'twopart_side.bc', '-o', 'something.js'], stdout=PIPE, stderr=PIPE).communicate() # combine them
+        # Compiling two source files into a final JS.
+        for args, target in [([], 'a.out.js'), (['-o', 'combined.js'], 'combined.js')]:
+          clear()
+          output = Popen([compiler, path_from_root('tests', 'twopart_main.cpp'), path_from_root('tests', 'twopart_side.cpp')] + args,
+                         stdout=PIPE, stderr=PIPE).communicate()
+          assert len(output[0]) == 0, output[0]
+          assert os.path.exists(target), '\n'.join(output)
+          self.assertContained('side got: hello from main, over', run_js(target))
+
+        # Compiling two files with -c will generate separate .bc files
+        #assert os.path.exists('twopart_main.bc'), '\n'.join(output)
+        #assert os.path.exists('twopart_side.bc'), '\n'.join(output)
+        #output = Popen([compiler, 'twopart_main.bc', 'twopart_side.bc', '-o', 'something.js'], stdout=PIPE, stderr=PIPE).communicate() # combine them
 
       # linking - TODO. in particular, test normal project linking, static and dynamic: get_library should not need to be told what to link!
       #   emcc a.cpp b.cpp => one .js