diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 10:49:15 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 10:49:15 -0800 |
| commit | f034e3928783ff7a6491833f358c51cfb082b197 (patch) | |
| tree | b4291ba96c0017aa17c7dce56f16fa1f5a62447a /tests/test_other.py | |
| parent | 6344b5c8d41ee9489ad51b40f9b0bee770b1a22f (diff) | |
| parent | a4b3e03260b90e288925cc1dfd9d4d591bc7741c (diff) | |
Merge branch 'add-libuuid' of github.com:fadams/emscripten into incoming
Conflicts:
tools/shared.py
Diffstat (limited to 'tests/test_other.py')
| -rw-r--r-- | tests/test_other.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/test_other.py b/tests/test_other.py index 9c983f9f..f9ee2d9d 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -2209,3 +2209,4 @@ mergeInto(LibraryManager.library, { process = Popen([PYTHON, EMCC, '-c', path_from_root('tests', 'hello_world.c'), '-o', outdir, '--default-obj-ext', 'obj'], stdout=PIPE, stderr=PIPE) process.communicate() assert(os.path.isfile(outdir + 'hello_world.obj')) + |