From 28c4a8a346fafe23820861458cfd3a87d82d6d2b Mon Sep 17 00:00:00 2001
From: ChillerDragon <ChillerDragon@gmail.com>
Date: Tue, 28 Jun 2022 16:26:40 +0200
Subject: [PATCH] Sort CI logs before diff to fix race condition

Logging to file and to stdout might order differently
due to multiple threads
---
 scripts/integration_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/integration_test.sh b/scripts/integration_test.sh
index 5802ce684..298d79f73 100755
--- a/scripts/integration_test.sh
+++ b/scripts/integration_test.sh
@@ -285,7 +285,7 @@ do
 		touch fail_logs.txt
 		continue
 	fi
-	logdiff="$(diff -u "$logfile" "stdout_$(basename "$logfile" .log).txt")"
+	logdiff="$(diff -u <(sort "$logfile") <(sort "stdout_$(basename "$logfile" .log).txt"))"
 	if [ "$logdiff" != "" ]
 	then
 		echo "[-] Error: logfile '$logfile' differs from stdout"