Update tests now that usbguard-dbus was moved into usbguard-daemon.

Author: Allen-Webb

src/Tests/LDAP/Sanity/ldap-nsswitch.sh

@@ -29,7 +29,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi

src/Tests/LDAP/UseCase/ldap-test-1.sh

@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi

src/Tests/LDAP/UseCase/ldap-test-2.sh

@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi

src/Tests/LDAP/UseCase/ldap-test-3.sh

@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi

src/Tests/LDAP/UseCase/ldap-test-4.sh

@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi

src/Tests/LDAP/UseCase/ldap-test-5.sh

@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi

src/Tests/Makefile.am

@@ -66,7 +66,6 @@ TESTS_ENVIRONMENT=\
 	USBGUARD_TESTLIB_BASH=$(top_srcdir)/src/Tests/bash-testlib.sh \
 	USBGUARD=$(top_builddir)/usbguard \
 	USBGUARD_DAEMON=$(top_builddir)/usbguard-daemon \
-	USBGUARD_DBUS=$(top_builddir)/usbguard-dbus \
 	LDAP_UTIL=$(top_srcdir)/src/Tests/LDAP/ldap.sh \
 	NSSWITCH=$(top_srcdir)/src/Tests/LDAP/nsswitch.sh
 

src/Tests/UseCase/000_executable.sh

@@ -28,7 +28,4 @@ schedule "${USBGUARD}" :valgrind
 schedule "${USBGUARD_DAEMON} -h"
 schedule "${USBGUARD_DAEMON} -h" :valgrind
 
-[ -f "${USBGUARD_DBUS}" ] && schedule "${USBGUARD_DBUS} -h"
-[ -f "${USBGUARD_DBUS}" ] && schedule "${USBGUARD_DBUS} -h" :valgrind
-
 execute 10