Skip to content

Commit

Permalink
Update tests now that usbguard-dbus was moved into usbguard-daemon.
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen-Webb committed Oct 18, 2019
1 parent b1f39b9 commit 14040ad
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion src/Tests/LDAP/Sanity/ldap-nsswitch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Tests/LDAP/UseCase/ldap-test-1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Tests/LDAP/UseCase/ldap-test-2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Tests/LDAP/UseCase/ldap-test-3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Tests/LDAP/UseCase/ldap-test-4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Tests/LDAP/UseCase/ldap-test-5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions src/Tests/UseCase/000_executable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 14040ad

Please sign in to comment.