diff --git a/Makefile b/Makefile index 0c934f2bdc10814a7fb826b5248c7d98821c4a8e..b7f69ee3eee5336a220ac3cd55ceec3c6ee9c339 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SOURCE_hashbackup = command.py config.py loghandler.py hashtoc.py \ - primary.py secondary.py + primary.py secondary.py tar_stream.py all: md5backup sha512backup diff --git a/test/test_sha512backup.sh b/test/test_sha512backup.sh index e2268005049981b4b8d934c4afd6dc49540a9c77..d0a14d1293c029274c5f1bfcf524bf58e73f4271 100755 --- a/test/test_sha512backup.sh +++ b/test/test_sha512backup.sh @@ -47,27 +47,43 @@ config > "${TESTDIR}/2/TOTALBACKUP.config" #config #../config.py <(config) -../sha512backup --xattr --primary <(config) 2> /dev/null +cp ../sha512backup "${TESTDIR}/" +${TESTDIR}/sha512backup --xattr --primary <(config) 2> /dev/null # Check that source and dest are equal -diff -u <(cd ../test ; find | sort) <(cd ${TESTDIR}/1/test ; find | sort) -diff -u <(cd ../.git/refs ; find | sort) <(cd ${TESTDIR}/2/.git/refs ; find | sort) +diff -u \ + <(cd ../test ; find | sort) \ + <(cd ${TESTDIR}/1/test ; find | sort) +diff -u \ + <(cd ../.git/refs ; find | sort) \ + <(cd ${TESTDIR}/2/.git/refs ; find | sort) # Delete temporary file rm ${TESTFILE} # Make sure source and dest differs -! diff -u <(cd ../test ; find | sort) <(cd ${TESTDIR}/1/test ; find | sort) -diff -u <(cd ../.git/refs ; find | sort) <(cd ${TESTDIR}/2/.git/refs ; find | sort) +! \ + diff -u \ + <(cd ../test ; find | sort) \ + <(cd ${TESTDIR}/1/test ; find | sort) +diff -u \ + <(cd ../test ; find | sort) \ + <(cd ${TESTDIR}/1/test ; find | grep -v "${TESTFILE}" | sort) +diff -u \ + <(cd ../.git/refs ; find | sort) \ + <(cd ${TESTDIR}/2/.git/refs ; find | sort) # Bring dest to sync -../sha512backup --xattr --primary <(config) 2> /dev/null +${TESTDIR}/sha512backup --xattr --primary <(config) 2> /dev/null # Check that source and dest are equal -diff -u <(cd ../test ; find | sort) <(cd ${TESTDIR}/1/test ; find | sort) -diff -u <(cd ../.git/refs ; find | sort) <(cd ${TESTDIR}/2/.git/refs ; find | sort) +diff -u \ + <(cd ../test ; find | sort) \ + <(cd ${TESTDIR}/1/test ; find | sort) +diff -u \ + <(cd ../.git/refs ; find | sort) \ + <(cd ${TESTDIR}/2/.git/refs ; find | sort) + # Check that deleted file exists in TRASH [ -f ${TESTDIR}/1/TRASH/*/${TESTFILE} ] -# ../md5backup --xattr --primary <(config) -# find ${TESTDIR}