1 files changed, 27 insertions, 19 deletions

diff --git a/test/afb-test.sh b/test/afb-test.sh
index 96733bf..f792fb2 100755
--- a/test/afb-test.sh
+++ b/test/afb-test.sh
@@ -1,41 +1,49 @@
 #!/bin/sh
 trap "cleanup 0" EXIT
-trap "cleanup 1" SIGHUP SIGINT SIGABRT SIGTERM
+trap "cleanup 1" SIGINT SIGTERM SIGABRT SIGHUP
 cleanup() {
-  rm -f $LOGPIPE
-  echo "Removing $LOGPIPE"
-  trap '' EXIT SIGHUP SIGINT SIGABRT SIGTERM
+  trap '' SIGINT SIGTERM SIGABRT SIGHUP EXIT
+  kill $AFTESTPID > /dev/null 2>&1
+  rm -f $AFTESTSOCKET
+  pkill $PROCNAME
   exit $1
 }
 
 BINDER=$(command -v afb-daemon)
 AFBTEST="$(pkg-config --variable libdir afb-test)/aft.so"
-PROCNAME="aft-signal-composer"
-PORT=1234
+if [ ! $? -eq 0 ]; then echo "Set PKG_CONFIG_PATH for afb-test"; exit -1; fi
+PROCNAME="afbd-signal-composer"
+PORT1=1234
+PORT2=1235
 TOKEN=
-LOGPIPE="test.pipe"
 [ "$1" ] && BUILDDIR="$1" || exit 1
+AFTESTSOCKET=/tmp/signal-composer
 
 TESTPACKAGEDIR="${BUILDDIR}/package-test"
-[ ! -p $LOGPIPE ] && mkfifo $LOGPIPE
 export AFT_CONFIG_PATH="${TESTPACKAGEDIR}/etc"
 export AFT_PLUGIN_PATH="${TESTPACKAGEDIR}/var:${TESTPACKAGEDIR}/lib/plugins"
 
 pkill $PROCNAME
 
 ${BINDER} 	--name="${PROCNAME}" \
-			--port="${PORT}" \
-			--roothttp=. \
+            --port="${PORT1}" \
 			--tracereq=common \
 			--token=${TOKEN} \
+            --rootdir="${TESTPACKAGEDIR}/../package" \
 			--workdir="${TESTPACKAGEDIR}" \
 			--binding="../package/lib/afb-signal-composer.so" \
-			--binding="$AFBTEST" \
-			--call="aft-signal-composer/launch_all_tests:{}" \
-			--call="aft-signal-composer/exit:{}" \
-			-vvv > ${LOGPIPE} 2>&1 &
-
-while read -r line
-do
-	[ "$(echo "${line}" | grep 'NOTICE: Browser URL=')" ] && break
-done < ${LOGPIPE}
\ No newline at end of file
+            --ws-server=unix:${AFTESTSOCKET} > /dev/null 2>& 1 &
+AFTESTPID=$!
+
+sleep 0.3
+
+${BINDER} --name=aft-signal-composer \
+--workdir="package-test/" \
+--port="${PORT2}" \
+--binding=${AFBTEST} \
+--ws-client=unix:${AFTESTSOCKET}  \
+--call="aft-signal-composer/launch_all_tests:{}" \
+--call="aft-signal-composer/exit:{}"
+
+find "${BUILDDIR}" -name test_results.log -exec cat {} \;
+