Merge pull request #570 from ysangkok/for-upstream

don't pass EMCC specific flags on when configuring using clang

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 090ad3f0..baa9eb5e 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7674,6 +7674,19 @@ fscanfed: 10 - hello
       code = open('a.out.js').read()
       assert 'SAFE_HEAP' in code, 'valid -s option had an effect'
 
+    def test_conftest_s_flag_passing(self):
+      open(os.path.join(self.get_dir(), 'conftest.c'), 'w').write(r'''
+        int main() {
+          return 0;
+        }
+      ''')
+      os.environ["EMMAKEN_JUST_CONFIGURE"] = "1"
+      cmd = ['python', EMCC, '-s', 'ASSERTIONS=1', os.path.join(self.get_dir(), 'conftest.c'), '-o', 'conftest']
+      output = Popen(cmd, stderr=PIPE).communicate()
+      self.assertNotContained('emcc: warning: treating -s as linker option', output[1])
+      assert os.path.exists('conftest')
+      del os.environ["EMMAKEN_JUST_CONFIGURE"]
+
     def test_crunch(self):
       # crunch should not be run if a .crn exists that is more recent than the .dds
       shutil.copyfile(path_from_root('tests', 'ship.dds'), 'ship.dds')