diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 15:40:53 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-07 15:40:53 -0800 |
| commit | 0b3416a1dcd808fb71043a9f400f3ef2aa636abc (patch) | |
| tree | 9a7ff926af193e432f5646afbcfb2c7365b17879 /tests/test_other.py | |
| parent | 6fee37fceb9e06a805c8074aa68bf678f406ff5b (diff) | |
| parent | e4e8063f6d568277b297f19d51801cd7dda9545c (diff) | |
Merge branch 'incoming' into llvm-3.41.8.6
Conflicts:
tests/test_benchmark.py
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')) + |