socket improvements towards enet test

3 files changed, 21 insertions, 25 deletions

diff --git a/tests/enet_client.c b/tests/enet_client.c
index fca63a51..59010184 100644
--- a/tests/enet_client.c
+++ b/tests/enet_client.c
@@ -1,5 +1,6 @@
 // g++ /home/alon/Dev/emscripten/tests/enet_client.c -I/home/alon/Dev/emscripten/system/include/emscripten/ -Iinclude/ -fpermissive .libs/libenet.a -o enet_client
 
+#include <stdio.h>
 #include <emscripten.h>
 
 #include <enet/enet.h>
@@ -13,7 +14,7 @@ void main_loop() {
   switch (event.type)
   {
     case ENET_EVENT_TYPE_CONNECT:
-      printf ("Connection succeeded\n");
+      printf ("Connection succeeded!\n");
 
       break;
     case ENET_EVENT_TYPE_RECEIVE:
@@ -58,10 +59,9 @@ int main (int argc, char ** argv)
     exit (EXIT_FAILURE);
   }
 
-  /* Connect to some.server.net:1234. */
   ENetAddress address;
   enet_address_set_host (& address, "localhost");
-  address.port = 1234;
+  address.port = 1237;
 
   printf("connecting to server...\n");
 
@@ -73,19 +73,14 @@ int main (int argc, char ** argv)
     "No available peers for initiating an ENet connection.\n");
     exit (EXIT_FAILURE);
   }
-  /* Wait up to 5 seconds for the connection attempt to succeed. */
-  ENetEvent event;
-  if (enet_host_service (host, & event, 5000) > 0 &&
-      event.type == ENET_EVENT_TYPE_CONNECT)
-  {
-    puts ("Connection to some.server.net:1234 succeeded.");
-  }
-  else
-  {
-    enet_peer_reset (peer);
-    puts ("Connection to some.server.net:1234 failed.");
-    return 0;
-  }
+
+#if EMSCRIPTEN
+  emscripten_run_script("console.log('adding iframe');"
+                        "var iframe = document.createElement('iframe');"
+                        "iframe.src = 'server.html';"
+                        "document.body.appendChild(iframe);"
+                        "console.log('added.');");
+#endif
 
   emscripten_set_main_loop(main_loop, 0);
 
diff --git a/tests/enet_server.c b/tests/enet_server.c
index 5a24155f..351cc921 100644
--- a/tests/enet_server.c
+++ b/tests/enet_server.c
@@ -1,5 +1,6 @@
 // g++ /home/alon/Dev/emscripten/tests/enet_server.c -I/home/alon/Dev/emscripten/system/include/emscripten/ -Iinclude/ -fpermissive .libs/libenet.a -o enet_server
 
+#include <stdio.h>
 #include <emscripten.h>
 
 #include <enet/enet.h>
@@ -69,7 +70,7 @@ int main (int argc, char ** argv)
 
   ENetAddress address;
   address.host = ENET_HOST_ANY;
-  address.port = 1234;
+  address.port = 1235;
   printf("create!\n");
   host = enet_host_create (& address /* the address to bind the server host to */,
                              32 /* allow up to 32 clients and/or outgoing connections */,
diff --git a/tests/runner.py b/tests/runner.py
index 07c5e990..674bb8f9 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -8799,21 +8799,21 @@ elif 'browser' in str(sys.argv):
         self.clean_pids()
 
     def zzztest_zz_enet(self):
-      #try:
-      #  with self.WebsockHarness(8992, self.relay_server):
-      #    with self.WebsockHarness(8994, no_server=True):
+      try:
+        with self.WebsockHarness(1234, self.relay_server):
+          with self.WebsockHarness(1236, no_server=True):
             try_delete(self.in_dir('enet'))
             shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet'))
             pwd = os.getcwd()
             os.chdir(self.in_dir('enet'))
             Popen(['python', path_from_root('emconfigure'), './configure']).communicate()
             Popen(['python', path_from_root('emmake'), 'make']).communicate()
-            enet = self.in_dir('enet', '.libs', 'libenet.a')
+            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'), enet, '-o', 'server.html']).communicate()
-            self.btest('enet_client.c', expected='cheez', args=[enet])
-      #finally:
-      #  self.clean_pids()
+            Popen(['python', EMCC, path_from_root('tests', 'enet_server.c'), '-o', 'server.html'] + enet).communicate()
+            self.btest('enet_client.c', expected='cheez', args=enet)
+      finally:
+        self.clean_pids()
 
 elif 'benchmark' in str(sys.argv):
   # Benchmarks. Run them with argument |benchmark|. To run a specific test, do