integration tests: Use LD_PRELOAD only when running SysDB tools.

Just as a cleanup.

diff --git a/t/integration/simple_config.sh b/t/integration/simple_config.sh
index e6daddcf218ead9688be7aab56d1c95e28b5941b..177d934c1d83735ba8fa256fae20d29cc20c5af2 100755 (executable)
--- a/t/integration/simple_config.sh
+++ b/t/integration/simple_config.sh
@@ -37,7 +37,7 @@ cat <<EOF > "$SYSDBD_CONF"
 Listen "invalid://address"
 EOF
 
-if $SYSDBD -D -C "$SYSDBD_CONF"; then
+if run_sysdbd -D -C "$SYSDBD_CONF"; then
        echo 'SysDBd accepted invalid listen address; expected: failure' >&2
        exit 1
 fi
@@ -46,7 +46,7 @@ cat <<EOF > "$SYSDBD_CONF"
 Listen "$SOCKET_FILE"
 EOF
 
-$SYSDBD -D -C "$SYSDBD_CONF" &
+run_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 e7118974fd95b4cbfe4b65800ff19c1017dfbc91..3be00655392eae11d377cf25acd0172d617dd480 100755 (executable)
--- a/t/integration/simple_query.sh
+++ b/t/integration/simple_query.sh
@@ -43,18 +43,18 @@ LoadBackend mock_plugin
 </Backend>
 EOF
 
-$SYSDBD -D -C "$SYSDBD_CONF" &
+run_sysdbd -D -C "$SYSDBD_CONF" &
 sysdbd_pid=$!
 
 wait_for_sysdbd
 sleep 3
 
 # On parse errors, expect a non-zero exit code.
-output="$( $SYSDB -H "$SOCKET_FILE" -c INVALID )" && exit 1
+output="$( run_sysdb -H "$SOCKET_FILE" -c INVALID )" && exit 1
 echo "$output" | grep "Failed to parse query 'INVALID'"
 echo "$output" | grep "parse error: syntax error"
 
-output="$( $SYSDB -H "$SOCKET_FILE" -c LIST )"
+output="$( run_sysdb -H "$SOCKET_FILE" -c LIST )"
 echo "$output" \
        | grep -F '"host1.example.com"' \
        | grep -F '"host2.example.com"' \
@@ -62,7 +62,7 @@ echo "$output" \
        | grep -F '"other.host.name"' \
        | grep -F '"some.host.name"'
 
-output="$( $SYSDB -H "$SOCKET_FILE" -c "FETCH 'host1.example.com'" )"
+output="$( run_sysdb -H "$SOCKET_FILE" -c "FETCH 'host1.example.com'" )"
 echo "$output" \
        | grep -F '"host1.example.com"' \
        | grep -F '"mock service"' \
@@ -73,11 +73,11 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'some.host.name' && exit 1
 
 # When requesting information for unknown hosts, expect a non-zero exit code.
-output="$( $SYSDB -H "$SOCKET_FILE" -c "FETCH 'does.not.exist'" )" \
+output="$( run_sysdb -H "$SOCKET_FILE" -c "FETCH 'does.not.exist'" )" \
        && exit 1
 echo "$output" | grep -F 'not found'
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
        -c "LOOKUP hosts WHERE attribute.architecture = 'x42'" )"
 echo "$output" \
        | grep -F '"host1.example.com"' \
@@ -86,7 +86,7 @@ echo "$output" | grep -F 'localhost' && exit 1
 echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'some.host.name' && exit 1
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
        -c "LOOKUP hosts WHERE attribute.name != 'architecture'" )"
 echo "$output" \
        | grep -F '"some.host.name"' \
@@ -95,7 +95,7 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'host1.example.com' && exit 1
 echo "$output" | grep -F 'host2.example.com' && exit 1
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
        -c "LOOKUP hosts WHERE service.name = 'sysdbd'" )"
 echo "$output" | grep -F '"localhost"'
 echo "$output" | grep -F 'some.host.name' && exit 1
@@ -103,7 +103,7 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'host1.example.com' && exit 1
 echo "$output" | grep -F 'host2.example.com' && exit 1
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
        -c "LOOKUP hosts WHERE host.name =~ 'example.com'" )"
 echo "$output" \
        | grep -F '"host1.example.com"' \
@@ -113,7 +113,7 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'localhost' && exit 1
 
 # When querying hosts that don't exist, expect a zero exit code.
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
        -c "LOOKUP hosts WHERE attribute.invalid = 'none'" )"
 echo $output | grep -E '^\[\]$'
 

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 6386b205f467d45052d686e02d210d960ca71f44..7bba1515361f804e8444ed717485e87a210841b3 100644 (file)
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -49,10 +49,14 @@ SYSDBD_CONF="$TESTDIR/sysdbd.conf"
 SOCKET_FILE="$TESTDIR/sock"
 PLUGIN_DIR="$TESTDIR"
 
-SYSDB="$MEMCHECK $TESTDIR/sysdb -U mockuser"
-SYSDBD="$MEMCHECK $TESTDIR/sysdbd"
+function run_sysdb() {
+       LD_PRELOAD=$TESTDIR/libsysdbclient.so $MEMCHECK \
+               "$TESTDIR/sysdb" -U mockuser "$@"
+}
 
-export LD_PRELOAD=$TESTDIR/libsysdbclient.so:$TESTDIR/libsysdb.so
+function run_sysdbd() {
+       LD_PRELOAD=$TESTDIR/libsysdb.so $MEMCHECK "$TESTDIR/sysdbd" "$@"
+}
 
 function wait_for_sysdbd() {
        local i