From bea87028d855a62771324f4458696165c566b997 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C4=83zvan=20Crainea?= <razvan.crainea@gmail.com>
Date: Sun, 27 May 2012 20:13:13 +0300
Subject: [PATCH] test: moved testing script

---
 test/Makefile             |  12 ++++++++++++
 test/client/.gitignore    |   2 ++
 test/client/client        | Bin 7571 -> 0 bytes
 test/server/.gitignore    |   2 ++
 test/server/server.c      |   2 +-
 test/{client => }/test.sh |  28 +++++++++++++++-------------
 6 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 test/Makefile
 create mode 100644 test/client/.gitignore
 delete mode 100755 test/client/client
 create mode 100644 test/server/.gitignore
 rename test/{client => }/test.sh (70%)

diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..22d865b
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,12 @@
+all: client server
+
+.PHONY: client server clean
+client server:
+	make -C $@
+
+run: client server
+	@./test.sh
+
+clean:
+	-make -C client clean
+	-make -C server clean
diff --git a/test/client/.gitignore b/test/client/.gitignore
new file mode 100644
index 0000000..a54b530
--- /dev/null
+++ b/test/client/.gitignore
@@ -0,0 +1,2 @@
+client.o
+client
diff --git a/test/client/client b/test/client/client
deleted file mode 100755
index 6f7edef24ecf6a08238699c246b4c7c7bdc70803..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7571
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
LMufa7Qa=A1F}Z&Q

diff --git a/test/server/.gitignore b/test/server/.gitignore
new file mode 100644
index 0000000..b594a0a
--- /dev/null
+++ b/test/server/.gitignore
@@ -0,0 +1,2 @@
+server.o
+server
diff --git a/test/server/server.c b/test/server/server.c
index 9c1e228..cf7b245 100644
--- a/test/server/server.c
+++ b/test/server/server.c
@@ -43,9 +43,9 @@ int main(int argc, char **argv)
 		printf("Cannot bind to server: %s(%d)\n", strerror(errno), errno);
 		return -1;
 	}
-	argv += 2;
 
 	printf("Bound to: %s:%s\n", argv[0], argv[1]);
+	argv += 2;
 	
 	err = read(sock, argv[0], sizeof(argv[0]));
 	if (err < 0) {
diff --git a/test/client/test.sh b/test/test.sh
similarity index 70%
rename from test/client/test.sh
rename to test/test.sh
index b961f72..d36d0fe 100755
--- a/test/client/test.sh
+++ b/test/test.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
 MODULE_NAME=af_p2pkp
-MODULE_DIR=../../module
-CLIENT=./client
+MODULE_DIR=../module
+CLIENT=client/client
+SERVER=server/server
+IP="127.0.0.1"
 
 LISTENERS_PORTS=(
 	60000
 	60001
-	60002
 )
 
 
@@ -17,25 +18,26 @@ echo 2 | update-alternatives --config nc &> /dev/null
 #increase tests debugging
 set -x
 
+# insert module, causing the message to be sent
+insmod $MODULE_DIR/$MODULE_NAME.ko
+
 # listen for UDP packets on localhost, port 60000 (run in background)
-for listener in "${LISTENERS_PORTS[@]}"; do
-	netcat -l -u -p $listener &
+for port in "${LISTENERS_PORTS[@]}"; do
+	$SERVER $IP $port testfile.$port &
 	pids="$pids $!"
-	ARGUMENTS="127.0.0.1 $listener $ARGUMENTS"
+	ARGUMENTS="$IP $port $ARGUMENTS"
 done
 
 # wait for netcat to start listening
 sleep 1
 
-# insert module, causing the message to be sent
-insmod $MODULE_DIR/$MODULE_NAME.ko
-
 $CLIENT $ARGUMENTS
 
-# remove module
-rmmod $MODULE_NAME
-
 # kill netcat
 for pid in $pids; do
-	kill $pid &> /dev/null
+	wait $pid &> /dev/null
 done
+
+# remove module
+rmmod $MODULE_NAME
+
-- 
2.20.1