summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-08-25 17:37:05 +1200
committerAndrew Bartlett <abartlet@samba.org>2017-09-20 08:15:22 +0200
commitda575f01313673fedfc7d15ec11ba6818dbd30d8 (patch)
treee980aece3da25d5dd104844af9ab1385aacdc5f9 /testprogs
parent9e9a8d8f887a3b13d06a7cc71edad78c140bb0be (diff)
downloadsamba-da575f01313673fedfc7d15ec11ba6818dbd30d8.tar.gz
selftest: sort dbcheck output to avoid sort order impacting results
The GUID index code will change the returned results order Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/dbcheck-links.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/testprogs/blackbox/dbcheck-links.sh b/testprogs/blackbox/dbcheck-links.sh
index fb66d14e6f1..17973e97429 100755
--- a/testprogs/blackbox/dbcheck-links.sh
+++ b/testprogs/blackbox/dbcheck-links.sh
@@ -59,7 +59,9 @@ dbcheck() {
if [ "$?" != "1" ]; then
return 1
fi
- diff $tmpfile $release_dir/expected-dbcheck-link-output.txt
+ sort $tmpfile > $tmpfile.sorted
+ sort $release_dir/expected-dbcheck-link-output.txt > $tmpfile.expected
+ diff -u $tmpfile.sorted $tmpfile.expected
if [ "$?" != "0" ]; then
return 1
fi