X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fintegration%2Fsimple_query.sh;h=76b54d66e840f8333b51bebaff7ec2eb64fc7cbf;hb=2e614bb5b95f81f5cc2f1f561ba070505c23f461;hp=37c57a1b4221387404ce2ddb9002cfc1a70e8adf;hpb=97aa30ed76096fbd663290d340de40a9ca7acdab;p=sysdb.git

diff --git a/t/integration/simple_query.sh b/t/integration/simple_query.sh
index 37c57a1..76b54d6 100755
--- a/t/integration/simple_query.sh
+++ b/t/integration/simple_query.sh
@@ -33,7 +33,7 @@ set -e
 
 source "$( dirname "$0" )/test_lib.sh"
 
-cat <<EOF > "$TESTDIR/sysdbd.conf"
+cat <<EOF > "$SYSDBD_CONF"
 Listen "$SOCKET_FILE"
 PluginDir "$PLUGIN_DIR"
 Interval 2
@@ -43,16 +43,19 @@ LoadBackend mock_plugin
 </Backend>
 EOF
 
-"$TOP_SRCDIR/src/sysdbd" -D -C "$TESTDIR/sysdbd.conf" &
+$SYSDBD -D -C "$SYSDBD_CONF" &
 sysdbd_pid=$!
 
 wait_for_sysdbd
 sleep 3
 
-"$TOP_SRCDIR/src/sysdb" -H "$SOCKET_FILE" -c LIST \
+output="$( $SYSDB -H "$SOCKET_FILE" -c LIST )"
+echo "$output" \
 	| grep -F '"host1.example.com"' \
 	| grep -F "host2.example.com" \
 	| grep -F "localhost" \
 	| grep -F "other.host.name" \
 	| grep -F "some.host.name"
-kill $!
+kill $sysdbd_pid
+wait $sysdbd_pid
+