# HG changeset patch # User Olaf Wintermann # Date 1686598992 -7200 # Node ID a2f1d7c1755c0cbdb9bb8c44d046b3e7d2c15523 # Parent ae759e4be591b32dcee063ff77ac6b6aa4b31a93 fix bin-tests not using the correct binary directory diff -r ae759e4be591 -r a2f1d7c1755c test/bin-test/Makefile --- a/test/bin-test/Makefile Mon Jun 12 21:40:31 2023 +0200 +++ b/test/bin-test/Makefile Mon Jun 12 21:43:12 2023 +0200 @@ -26,8 +26,8 @@ # POSSIBILITY OF SUCH DAMAGE. # -DAV = ../../build/dav -DAV_SYNC = ../../build/dav-sync +DAV = ../../build/bin/dav +DAV_SYNC = ../../build/bin/dav-sync all: dav dav-sync diff -r ae759e4be591 -r a2f1d7c1755c test/bin-test/test-dav-sync-push1.sh --- a/test/bin-test/test-dav-sync-push1.sh Mon Jun 12 21:40:31 2023 +0200 +++ b/test/bin-test/test-dav-sync-push1.sh Mon Jun 12 21:43:12 2023 +0200 @@ -259,8 +259,11 @@ # delete everything # collection is empty + + rm -Rf tmp-sync/test1a/* + dav_sync_push test1a "push 11 failed" check_tmpout "0 conflicts" "push10: wrong conflict counter"