t/integration/: Added variables for sysdbd/sysdb/sysdb.conf.

diff --git a/t/integration/simple_config.sh b/t/integration/simple_config.sh
index 3484351420e48dce24d491717b467b0bc679b57e..677f53c05d8c2038bab85435dd8947de85d7efcb 100755 (executable)
--- a/t/integration/simple_config.sh
+++ b/t/integration/simple_config.sh
@@ -33,20 +33,20 @@ set -e
 
 source "$( dirname "$0" )/test_lib.sh"
 
-cat <<EOF > "$TESTDIR/sysdbd.conf"
+cat <<EOF > "$SYSDBD_CONF"
 Listen "invalid://address"
 EOF
 
-if "$TOP_SRCDIR/src/sysdbd" -D -C "$TESTDIR/sysdbd.conf"; then
+if "$SYSDBD" -D -C "$SYSDBD_CONF"; then
        echo 'SysDBd accepted invalid listen address; expected: failure' >&2
        exit 1
 fi
 
-cat <<EOF > "$TESTDIR/sysdbd.conf"
+cat <<EOF > "$SYSDBD_CONF"
 Listen "$SOCKET_FILE"
 EOF
 
-"$TOP_SRCDIR/src/sysdbd" -D -C "$TESTDIR/sysdbd.conf" &
+"$SYSDBD" -D -C "$SYSDBD_CONF" &
 sysdbd_pid=$!
 
 wait_for_sysdbd

diff --git a/t/integration/simple_query.sh b/t/integration/simple_query.sh
index 37c57a1b4221387404ce2ddb9002cfc1a70e8adf..d091e2b4b8d375d4bbf00c738de0c51792ac9e68 100755 (executable)
--- 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,13 +43,13 @@ 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 \
+"$SYSDB" -H "$SOCKET_FILE" -c LIST \
        | grep -F '"host1.example.com"' \
        | grep -F "host2.example.com" \
        | grep -F "localhost" \

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 85bffb9401cd2844605f83e757163459846721fe..b91cb0c37edafbe939d5803bc6410cad656e8869 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -35,9 +35,14 @@ trap "rm -rf '$TESTDIR'" EXIT
 mkdir "$TESTDIR/backend"
 cp "$TOP_SRCDIR/t/integration/.libs/mock_plugin.so" "$TESTDIR/backend"
 
+SYSDBD_CONF="$TESTDIR/sysdbd.conf"
+
 SOCKET_FILE="$TESTDIR/sock"
 PLUGIN_DIR="$TESTDIR"
 
+SYSDBD="$TOP_SRCDIR/src/sysdbd"
+SYSDB="$TOP_SRCDIR/src/sysdb"
+
 function wait_for_sysdbd() {
        local i
        for (( i=0; i<10; i++ )); do