aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-05-28 05:07:56 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-05-28 05:07:56 -0700
commit506de96842099ad1bdab2f4c70293ee4cce99aa5 (patch)
tree69ee71d6155ee56cdb14b609a28416c07352ab76
parenta2b42ed8c959aeb15e4225d877f6ccaaedf7df48 (diff)
test for scons integration and stop using emld there
-rwxr-xr-xtests/runner.py9
-rw-r--r--tools/scons/site_scons/site_tools/emscripten/emscripten.py2
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/runner.py b/tests/runner.py
index e3e0543b..d6731ed5 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -6899,6 +6899,15 @@ f.close()
assert 'foo.o: ' in output, '-%s failed to produce the right output: %s' % (opt, output)
assert 'error' not in err, 'Unexpected stderr: ' + err
+ def test_scons(self): # also incidentally tests c++11 integration in llvm 3.1
+ try_delete(os.path.join(self.get_dir(), 'test'))
+ shutil.copytree(path_from_root('tests', 'scons'), os.path.join(self.get_dir(), 'test'))
+ shutil.copytree(path_from_root('tools', 'scons', 'site_scons'), os.path.join(self.get_dir(), 'test', 'site_scons'))
+ os.chdir(os.path.join(self.get_dir(), 'test'))
+ Popen(['scons']).communicate()
+ output = run_js('scons_integration.js')
+ assert 'If you see this - the world is all right!' in output
+
def test_llvm_nativizer(self):
# avoid impure_ptr problems etc.
shutil.copyfile(path_from_root('tests', 'files.cpp'), os.path.join(self.get_dir(), 'files.cpp'))
diff --git a/tools/scons/site_scons/site_tools/emscripten/emscripten.py b/tools/scons/site_scons/site_tools/emscripten/emscripten.py
index cb14b58e..7ccf2c5f 100644
--- a/tools/scons/site_scons/site_tools/emscripten/emscripten.py
+++ b/tools/scons/site_scons/site_tools/emscripten/emscripten.py
@@ -28,7 +28,7 @@ def generate(env, emscripten_path=None, **kw):
env.Replace(CC = os.path.join(emscPath, "emcc" ))
env.Replace(CXX = os.path.join(emscPath, "em++" ))
- env.Replace(LINK = os.path.join(emscPath, "emld" ))
+ env.Replace(LINK = os.path.join(emscPath, "emcc" ))
# SHLINK and LDMODULE should use LINK so no
# need to change them here