From a0fb094b0f6f42b29a1772a8d92aa4027b2bcf8d Mon Sep 17 00:00:00 2001
From: Mehmet Yilmaz <mehmetyilmaz@microsoft.com>
Date: Tue, 1 Jul 2025 07:35:45 +0000
Subject: [PATCH] Refactor diff script to streamline normalization process and
 improve readability

---
 src/test/regress/bin/diff | 47 +++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/test/regress/bin/diff b/src/test/regress/bin/diff
index a0b40f328..30ce6ce83 100755
--- a/src/test/regress/bin/diff
+++ b/src/test/regress/bin/diff
@@ -34,21 +34,34 @@ then
 	fi
 fi
 
-if test -z "${VANILLATEST:-}"
-then
-	touch "$file1"  # when adding a new test the expected file does not exist
-	normalize_file="$BASEDIR/normalize.sed"
-	# when running tests on an existing cluster some changes need to be done on
-	# normalize.sed file. So a new file is used.
-	if [[ -f "$BASEDIR/normalize_modified.sed" ]]
-	then
-		normalize_file="$BASEDIR/normalize_modified.sed"
-	fi
-	sed -Ef "$normalize_file" < "$file1" > "$file1.modified"
-	sed -Ef "$normalize_file" < "$file2" > "$file2.modified"
-	"$DIFF" -w $args "$file1.modified" "$file2.modified" | LC_CTYPE=C.UTF-8 diff-filter "$BASEDIR/normalize.sed"
-	exit ${PIPESTATUS[0]}
-else
-	exec "$DIFF" -w $args "$file1" "$file2"
-fi
+# if test -z "${VANILLATEST:-}"
+# then
+# 	touch "$file1"  # when adding a new test the expected file does not exist
+# 	normalize_file="$BASEDIR/normalize.sed"
+# 	# when running tests on an existing cluster some changes need to be done on
+# 	# normalize.sed file. So a new file is used.
+# 	if [[ -f "$BASEDIR/normalize_modified.sed" ]]
+# 	then
+# 		normalize_file="$BASEDIR/normalize_modified.sed"
+# 	fi
+# 	sed -Ef "$normalize_file" < "$file1" > "$file1.modified"
+# 	sed -Ef "$normalize_file" < "$file2" > "$file2.modified"
+# 	"$DIFF" -w $args "$file1.modified" "$file2.modified" | LC_CTYPE=C.UTF-8 diff-filter "$BASEDIR/normalize.sed"
+# 	exit ${PIPESTATUS[0]}
+# else
+# 	exec "$DIFF" -w $args "$file1" "$file2"
+# fi
 
+
+touch "$file1"  # when adding a new test the expected file does not exist
+normalize_file="$BASEDIR/normalize.sed"
+# when running tests on an existing cluster some changes need to be done on
+# normalize.sed file. So a new file is used.
+if [[ -f "$BASEDIR/normalize_modified.sed" ]]
+then
+	normalize_file="$BASEDIR/normalize_modified.sed"
+fi
+sed -Ef "$normalize_file" < "$file1" > "$file1.modified"
+sed -Ef "$normalize_file" < "$file2" > "$file2.modified"
+"$DIFF" -w $args "$file1.modified" "$file2.modified" | LC_CTYPE=C.UTF-8 diff-filter "$BASEDIR/normalize.sed"
+exit ${PIPESTATUS[0]}
\ No newline at end of file