From a606469665f707f130c60ab94c7d4c377f53efd9 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Tue, 19 Jan 2021 18:57:25 +0100
Subject: [PATCH] Sort result of find
---
test/test_sha512backup.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/test_sha512backup.sh b/test/test_sha512backup.sh
index 84e2653..e226800 100755
--- a/test/test_sha512backup.sh
+++ b/test/test_sha512backup.sh
@@ -49,22 +49,22 @@ config > "${TESTDIR}/2/TOTALBACKUP.config"
../sha512backup --xattr --primary <(config) 2> /dev/null
# Check that source and dest are equal
-diff -u <(cd ../test ; find) <(cd ${TESTDIR}/1/test ; find .)
-diff -u <(cd ../.git/refs ; find) <(cd ${TESTDIR}/2/.git/refs ; find .)
+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) <(cd ${TESTDIR}/1/test ; find .)
-diff -u <(cd ../.git/refs ; find) <(cd ${TESTDIR}/2/.git/refs ; find .)
+! 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)
# Bring dest to sync
../sha512backup --xattr --primary <(config) 2> /dev/null
# Check that source and dest are equal
-diff -u <(cd ../test ; find) <(cd ${TESTDIR}/1/test ; find .)
-diff -u <(cd ../.git/refs ; find) <(cd ${TESTDIR}/2/.git/refs ; find .)
+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} ]
--
GitLab