fixed exploits in checker, added code for enochecker_test

1 files changed, 36 insertions, 2 deletions

diff --git a/do.sh b/do.sh
index 02f6a2f..db78a4b 100644
--- a/do.sh
+++ b/do.sh
@@ -60,9 +60,43 @@ elif [ "$1" == "cleansrc" ]; then
 		popd
 	fi
 elif [ "$1" == "test" ]; then
-	SRCDIR="$PWD/src" DATADIR="$PWD/service/data" bash "tests/test.sh" ${@:2}
+	SRCDIR="$PWD/service/src" DATADIR="$PWD/service/data" bash "tests/test.sh" ${@:2}
 elif [ "$1" == "make" ]; then
-	make -C src
+	make -C service/src
+elif [ "$1" == "ci-test" ]; then
+	cd "$REPOROOT"
+
+	docker-compose -f service/docker-compose.yml up --build -d -V
+	docker-compose -f checker/docker-compose.yml up --build -d -V
+
+	if [ -z "$ADDRESS" ]; then
+		echo "Specify your local network address via the ADDRESS var"
+		exit 1
+	fi
+	export ENOCHECKER_TEST_CHECKER_ADDRESS=$ADDRESS
+	export ENOCHECKER_TEST_CHECKER_PORT=9091
+	export ENOCHECKER_TEST_SERVICE_ADDRESS=$ADDRESS
+	export ENOCHECKER_TEST_SERVICE_PORT=9090
+	enochecker_test
+
+	docker-compose -f service/docker-compose.yml logs --no-color --tail=1000 > /tmp/ci-test-service.log
+	docker-compose -f checker/docker-compose.yml logs --no-color --tail=1000 > /tmp/ci-test-checker.log
+
+	docker-compose -f service/docker-compose.yml down
+	docker-compose -f checker/docker-compose.yml down
+elif [ "$1" == "parse-log" ]; then
+	python3 -c '
+#!/usr/bin/env python3
+
+import jsons, sys
+
+for l in open(sys.argv[1]).read().split("\n"):
+	if "##ENOLOGMESSAGE" not in l: continue
+	l = l.split("##ENOLOGMESSAGE ", 1)[1]
+	jmsg = jsons.loads(l)
+	print("[[ %s #%s ]] " % (jmsg["method"], jmsg["variantId"]), end="")
+	print(jmsg["message"] + "\n--------")
+	' "$2"
 else
 	echo "USAGE: do.sh (compose|test|cleansrc) [args..]"
 	echo "EXAMPLES:"