aboutsummaryrefslogtreecommitdiff
path: root/tests/test_other.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-09-18 13:34:30 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-18 13:34:30 -0700
commitfdf356f0c194e569aafcc3fe69c7e30dbb29c4ef (patch)
treed064391be07f74c6e1401281e9812bcd84590895 /tests/test_other.py
parentd34408d7f800ff9294cfc799e27455ca9618f84e (diff)
parent37c5356835984485c0edf87763a91a654080d2fe (diff)
Merge pull request #1611 from juj/cmake_link_js
Cmake link js
Diffstat (limited to 'tests/test_other.py')
-rw-r--r--tests/test_other.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_other.py b/tests/test_other.py
index b11f22e5..56c13650 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -295,7 +295,7 @@ f.close()
make = make_commands[generator]
cmake_cases = ['target_js', 'target_html']
- cmake_outputs = ['hello_world.js', 'hello_world_gles.html']
+ cmake_outputs = ['test_cmake.js', 'hello_world_gles.html']
for i in range(0, 2):
for configuration in ['Debug', 'Release']:
# CMake can be invoked in two ways, using 'emconfigure cmake', or by directly running 'cmake'.
@@ -342,7 +342,7 @@ f.close()
# Run through node, if CMake produced a .js file.
if cmake_outputs[i].endswith('.js'):
ret = Popen(listify(NODE_JS) + [tempdirname + '/' + cmake_outputs[i]], stdout=PIPE).communicate()[0]
- assert 'hello, world!' in ret, 'Running cmake-based .js application failed!'
+ self.assertTextDataIdentical(open(cmakelistsdir + '/out.txt', 'r').read().strip(), ret.strip())
finally:
os.chdir(path_from_root('tests')) # Move away from the directory we are about to remove.
shutil.rmtree(tempdirname)