- moved enet tests and relay script

 - added support for SOCKK define to override ports when compiling

4 files changed, 30 insertions, 15 deletions

diff --git a/tests/runner.py b/tests/runner.py
index bd98fe63..ddee682e 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -14107,7 +14107,7 @@ Press any key to continue.'''
     def make_relay_server(self, port1, port2):
       def relay_server(q):
         print >> sys.stderr, 'creating relay server on ports %d,%d' % (port1, port2)
-        proc = Popen([PYTHON, path_from_root('tests', 'socket_relay.py'), str(port1), str(port2)])
+        proc = Popen([PYTHON, path_from_root('tests', 'sockets/socket_relay.py'), str(port1), str(port2)])
         q.put(proc.pid)
         proc.communicate()
       return relay_server
@@ -14214,12 +14214,12 @@ Press any key to continue.'''
       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', 'sockets/test_enet_server.c'), '-o', 'server.html', '-DSOCKK=1235'] + 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='0', args=enet)
+            self.btest('sockets/test_enet_client.c', expected='0', args=['-DSOCKK=1237'] + enet)
       finally:
         self.clean_pids()
 
diff --git a/tests/socket_relay.py b/tests/sockets/socket_relay.py
index 5b6403f9..5b6403f9 100644
--- a/tests/socket_relay.py
+++ b/tests/sockets/socket_relay.py
diff --git a/tests/enet_client.c b/tests/sockets/test_enet_client.c
index 601b8769..bf14375c 100644
--- a/tests/enet_client.c
+++ b/tests/sockets/test_enet_client.c
@@ -1,20 +1,22 @@
 #include <stdio.h>
-#include <emscripten.h>
-
+#include <string.h>
 #include <enet/enet.h>
+#if EMSCRIPTEN
+#include <emscripten.h>
+#endif
 
 ENetHost * host;
 
 void main_loop() {
-  static int counter = 0;
 #if EMSCRIPTEN
+  static int counter = 0;
   counter++;
-#endif
   if (counter == 100) {
     printf("stop!\n");
     emscripten_cancel_main_loop();
     return;
   }
+#endif
 
   ENetEvent event;
   if (enet_host_service (host, & event, 0) == 0) return;
@@ -32,7 +34,11 @@ void main_loop() {
               event.channelID);
 
       int result = strcmp("packetfoo", event.packet->data);
+#if EMSCRIPTEN
       REPORT_RESULT();
+#else
+      exit(EXIT_SUCCESS);
+#endif
 
       /* Clean up the packet now that we're done using it. */
       enet_packet_destroy (event.packet);
@@ -73,11 +79,7 @@ int main (int argc, char ** argv)
 
   ENetAddress address;
   enet_address_set_host (& address, "localhost");
-#if EMSCRIPTEN
-  address.port = 1237;
-#else
-  address.port = 1235;
-#endif
+  address.port = SOCKK;
 
   printf("connecting to server...\n");
 
@@ -100,7 +102,11 @@ int main (int argc, char ** argv)
                         "console.log('added.');");
 #endif
 
+#if EMSCRIPTEN
   emscripten_set_main_loop(main_loop, 3, 1);
+#else
+  while (1) main_loop();
+#endif
 
   return 1;
 }
diff --git a/tests/enet_server.c b/tests/sockets/test_enet_server.c
index a8167e16..9a4518ac 100644
--- a/tests/enet_server.c
+++ b/tests/sockets/test_enet_server.c
@@ -1,10 +1,13 @@
 // g++ -fpermissive ../enet_server.c -I/home/alon/Dev/emscripten/system/include/emscripten/ -Iinclude/ -fpermissive .libs/libenet.a -o enet_server ; g++ ../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 <string.h>
 #include <enet/enet.h>
 
+#if EMSCRIPTEN
+#include <emscripten.h>
+#endif
+
 ENetHost *host;
 
 void send_msg(ENetPeer *peer) {
@@ -31,7 +34,9 @@ void main_loop() {
 #endif
   if (counter == 100) {
     printf("stop!\n");
+#if EMSCRIPTEN
     emscripten_cancel_main_loop();
+#endif
     return;
   }
 
@@ -82,7 +87,7 @@ int main (int argc, char ** argv)
 
   ENetAddress address;
   address.host = ENET_HOST_ANY;
-  address.port = 1235;
+  address.port = SOCKK;
   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 */,
@@ -96,7 +101,11 @@ int main (int argc, char ** argv)
     exit (EXIT_FAILURE);
   }
 
+#if EMSCRIPTEN
   emscripten_set_main_loop(main_loop, 3, 1);
+#else
+  while (1) main_loop();
+#endif
 
   return 1;
 }