summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-08-25 17:37:05 +1200
committerKarolin Seeger <kseeger@samba.org>2017-11-29 09:24:25 +0100
commited4189f3bb1db352ddff396a8ee6d1e103d67efa (patch)
tree2dd6ad90c2e8ab97310a463fee7d865327710c8a /testprogs
parent45911b030072cbfb305b104e304996dc2b5ee4ff (diff)
downloadsamba-ed4189f3bb1db352ddff396a8ee6d1e103d67efa.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> (cherry picked from commit da575f01313673fedfc7d15ec11ba6818dbd30d8)
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