From 80a75662ae8fd02ebfa94adddbe5a98ff9893bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@mistotebe.net>
Date: Tue, 16 Dec 2025 12:10:56 +0000
Subject: [PATCH] ITS#10250 Accept changes in attribute ordering for
 replication tests

---
 tests/scripts/test017-syncreplication-refresh |  4 ++--
 tests/scripts/test018-syncreplication-persist | 12 +++++-----
 tests/scripts/test019-syncreplication-cascade | 12 +++++-----
 tests/scripts/test045-syncreplication-proxied | 16 ++++++-------
 tests/scripts/test048-syncrepl-multiproxy     | 24 +++++++++----------
 .../test054-syncreplication-parallel-load     |  4 ++--
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 8b3cf6d25d..5bcf9371fd 100755
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -337,9 +337,9 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo "Filtering provider results..."
-$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT
+$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT
 echo "Filtering consumer results..."
-$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT
+$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT
 
 echo "Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index d867121e69..0b12face56 100755
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -350,9 +350,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering provider results..."
-$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT
+$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT
 echo "Filtering consumer results..."
-$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT
+$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT
 
 echo "Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -447,9 +447,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering provider results..."
-$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT
+$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT
 echo "Filtering consumer results..."
-$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT
+$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT
 
 echo "Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -526,9 +526,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering provider results..."
-$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT
+$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT
 echo "Filtering consumer results..."
-$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT
+$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT
 
 echo "Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 0c059ea0f1..13514fcb51 100755
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -428,17 +428,17 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo "Filtering provider ldapsearch results..."
-$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT
+$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT
 echo "Filtering R1 consumer ldapsearch results..."
-$LDIFFILTER < $SERVER2OUT > $SERVER2FLT
+$LDIFFILTER -s a < $SERVER2OUT > $SERVER2FLT
 echo "Filtering R2 consumer ldapsearch results..."
-$LDIFFILTER < $SERVER3OUT > $SERVER3FLT
+$LDIFFILTER -s a < $SERVER3OUT > $SERVER3FLT
 echo "Filtering P1 consumer ldapsearch results..."
-$LDIFFILTER < $SERVER4OUT > $SERVER4FLT
+$LDIFFILTER -s a < $SERVER4OUT > $SERVER4FLT
 echo "Filtering P2 consumer ldapsearch results..."
-$LDIFFILTER < $SERVER5OUT > $SERVER5FLT
+$LDIFFILTER -s a < $SERVER5OUT > $SERVER5FLT
 echo "Filtering P3 consumer ldapsearch results..."
-$LDIFFILTER < $SERVER6OUT > $SERVER6FLT
+$LDIFFILTER -s a < $SERVER6OUT > $SERVER6FLT
 
 echo "Comparing retrieved entries from provider and R1 consumer..."
 $CMP $PROVIDERFLT $SERVER2FLT > $CMPOUT
diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index efe7812a70..d84fbd8cc2 100755
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -411,9 +411,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -518,9 +518,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -607,9 +607,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -704,9 +704,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy
index 81f4fcba39..ca593de22f 100755
--- a/tests/scripts/test048-syncrepl-multiproxy
+++ b/tests/scripts/test048-syncrepl-multiproxy
@@ -175,9 +175,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.1" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.1" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.1" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.1" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -200,7 +200,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.1" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.1" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -359,9 +359,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.2" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.2" > $PROVIDERFLT
 #echo "Filtering P1 consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.2" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.2" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -384,7 +384,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.2" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.2" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -470,9 +470,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.3" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.3" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.3" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.3" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -495,7 +495,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.3" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.3" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -551,9 +551,9 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering provider results..."
-$LDIFFILTER < "${PROVIDEROUT}.4" > $PROVIDERFLT
+$LDIFFILTER -s a < "${PROVIDEROUT}.4" > $PROVIDERFLT
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.4" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.4" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
@@ -576,7 +576,7 @@ if test $RC != 0 ; then
 fi
 
 #echo "Filtering consumer results..."
-$LDIFFILTER < "${CONSUMEROUT}.4" > $CONSUMERFLT
+$LDIFFILTER -s a < "${CONSUMEROUT}.4" > $CONSUMERFLT
 
 echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT
diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load
index 3760077c5d..5f402c9e35 100755
--- a/tests/scripts/test054-syncreplication-parallel-load
+++ b/tests/scripts/test054-syncreplication-parallel-load
@@ -358,9 +358,9 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo "Filtering provider results..."
-$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT
+$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT
 echo "Filtering consumer results..."
-$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT
+$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT
 
 echo "Comparing retrieved entries from provider and consumer..."
 $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT