aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xemcc3
-rw-r--r--tests/test_sockets.py5
2 files changed, 6 insertions, 2 deletions
diff --git a/emcc b/emcc
index 4ba63f21..738179ad 100755
--- a/emcc
+++ b/emcc
@@ -1912,3 +1912,6 @@ finally:
else:
logging.info('emcc saved files are in:' + temp_dir)
+#//eliminate a = a in js opt. will kill STACKTOP = STACKTOP in funcs that do not use the C stack! add test for no STACKTOP or sp in such a func
+#// minify if into ?: ?
+
diff --git a/tests/test_sockets.py b/tests/test_sockets.py
index 26859699..8c2889df 100644
--- a/tests/test_sockets.py
+++ b/tests/test_sockets.py
@@ -403,8 +403,9 @@ class sockets(BrowserCore):
Popen([PYTHON, EMCC, temp_host_filepath, '-o', host_outfile] + ['-s', 'GL_TESTING=1', '--pre-js', 'host_pre.js', '-s', 'SOCKET_WEBRTC=1', '-s', 'SOCKET_DEBUG=1']).communicate()
Popen([PYTHON, EMCC, temp_peer_filepath, '-o', peer_outfile] + ['-s', 'GL_TESTING=1', '--pre-js', 'peer_pre.js', '-s', 'SOCKET_WEBRTC=1', '-s', 'SOCKET_DEBUG=1']).communicate()
- Popen(['npm', 'install', path_from_root('tests', 'sockets', 'p2p')]).communicate();
- broker = Popen(listify(NODE_JS) + [path_from_root('tests', 'sockets', 'p2p', 'broker', 'p2p-broker.js')]);
+ # note: you may need to run this manually yourself, if npm is not in the path, or if you need a version that is not in the path
+ Popen(['npm', 'install', path_from_root('tests', 'sockets', 'p2p')]).communicate()
+ broker = Popen(listify(NODE_JS) + [path_from_root('tests', 'sockets', 'p2p', 'broker', 'p2p-broker.js')])
expected = '1'
self.run_browser(host_outfile, '.', ['/report_result?' + e for e in expected])