aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-10-04 16:06:47 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-10-04 16:06:47 -0700
commit1cfd5c91b0a7d0d0009f4fece429f8c2cc6a501c (patch)
tree1e47ddf34d5d455ad6a56c65e2cf358c9622a48e /tests
parent4a5d3521d7f72b8aded5d2bddd74d5541d1eff3f (diff)
recvmsg and further socket debugging
Diffstat (limited to 'tests')
-rw-r--r--tests/enet_client.c12
-rw-r--r--tests/enet_server.c10
-rwxr-xr-xtests/runner.py4
3 files changed, 21 insertions, 5 deletions
diff --git a/tests/enet_client.c b/tests/enet_client.c
index f3101306..6eb088a3 100644
--- a/tests/enet_client.c
+++ b/tests/enet_client.c
@@ -6,6 +6,14 @@
ENetHost * host;
void main_loop() {
+ static int counter = 0;
+ counter++;
+ if (counter == 20) {
+ printf("stop!\n");
+ emscripten_cancel_main_loop();
+ return;
+ }
+
ENetEvent event;
if (enet_host_service (host, & event, 0) == 0) return;
switch (event.type)
@@ -81,12 +89,12 @@ int main (int argc, char ** argv)
"var iframe = document.createElement('iframe');"
"iframe.src = 'server.html';"
"iframe.width = '100%';"
- "iframe.height = '25%';"
+ "iframe.height = '33%';"
"document.body.appendChild(iframe);"
"console.log('added.');");
#endif
- emscripten_set_main_loop(main_loop, 500);
+ emscripten_set_main_loop(main_loop, 1);
return 1;
}
diff --git a/tests/enet_server.c b/tests/enet_server.c
index 52eed3e8..f43d511d 100644
--- a/tests/enet_server.c
+++ b/tests/enet_server.c
@@ -25,6 +25,14 @@ void send_msg(ENetPeer *peer) {
}
void main_loop() {
+ static int counter = 0;
+ counter++;
+ if (counter == 20) {
+ printf("stop!\n");
+ emscripten_cancel_main_loop();
+ return;
+ }
+
ENetEvent event;
if (enet_host_service (host, & event, 0) == 0) return;
switch (event.type)
@@ -84,7 +92,7 @@ int main (int argc, char ** argv)
exit (EXIT_FAILURE);
}
- emscripten_set_main_loop(main_loop, 500);
+ emscripten_set_main_loop(main_loop, 1);
return 1;
}
diff --git a/tests/runner.py b/tests/runner.py
index 28d59f21..dc2dab6a 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -8828,12 +8828,12 @@ elif 'browser' in str(sys.argv):
Popen(['python', path_from_root('emmake'), 'make']).communicate()
enet = [self.in_dir('enet', '.libs', 'libenet.a'), '-I'+path_from_root('tests', 'enet', 'include')]
os.chdir(pwd)
- Popen(['python', EMCC, path_from_root('tests', 'enet_server.c'), '-o', 'server.html'] + enet).communicate()
+ Popen(['python', EMCC, path_from_root('tests', 'enet_server.c'), '-o', 'server.html', '-s', 'SOCKET_DEBUG=1'] + enet).communicate()
try:
with self.WebsockHarness(1234, self.make_relay_server(1234, 1236)):
with self.WebsockHarness(1236, no_server=True):
- self.btest('enet_client.c', expected='cheez', args=enet)
+ self.btest('enet_client.c', expected='cheez', args=enet+['-s', 'SOCKET_DEBUG=1'])
finally:
self.clean_pids()