Tests might fail if lines compared in text files don't have the same
order.
Signed-off-by: Samuel GROOT <samuel.groot@xxxxxxxxxxxxxxxx>
Signed-off-by: Tom RUSSELLO <tom.russello@xxxxxxxxxxxxxxxx>
Signed-off-by: Matthieu MOY <matthieu.moy@xxxxxxxxxxxxxxx>
---
t/t9001-send-email.sh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index b3355d2..56ad8ce 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -39,6 +39,13 @@ test_expect_success $PREREQ 'Extract patches' '
patches=$(git format-patch -s --cc="One <one@xxxxxxxxxxx>" --cc=two@xxxxxxxxxxx -n HEAD^1)
'
+# Check if two files have the same content, non-order sensitive
+test_cmp_noorder () {
+ sort "$1" >"$1_noorder"
+ sort "$2" >"$2_noorder"
+ test_cmp $1 $2
+}
+
# Test no confirm early to ensure remaining tests will not hang
test_no_confirm () {
rm -f no_confirm_okay
@@ -97,7 +104,7 @@ test_expect_success $PREREQ 'setup expect' '
'
test_expect_success $PREREQ 'Verify commandline' '
- test_cmp expected commandline1
+ test_cmp_noorder expected commandline1
'
test_expect_success $PREREQ 'Send patches with --envelope-sender' '
@@ -117,7 +124,7 @@ test_expect_success $PREREQ 'setup expect' '
'
test_expect_success $PREREQ 'Verify commandline' '
- test_cmp expected commandline1
+ test_cmp_noorder expected commandline1
'
test_expect_success $PREREQ 'Send patches with --envelope-sender=auto' '
@@ -137,7 +144,7 @@ test_expect_success $PREREQ 'setup expect' '
'
test_expect_success $PREREQ 'Verify commandline' '
- test_cmp expected commandline1
+ test_cmp_noorder expected commandline1
'
test_expect_success $PREREQ 'setup expect' "
--
2.8.2.537.gb153d2a
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html