From c5708044e7a266eef3883a05af69ab348cb1a2c8 Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 22 Dec 2022 14:26:03 +0100
Subject: [PATCH] Rename dig reference files in the rrsetorder test

bin/tests/system/rrsetorder/dig.out* files match a gitignore expression
present in bin/tests/system/.gitignore.  Since these are meant to be
reference files that are compared to the files generated when the
"rrsetorder" system test is run, rename them to avoid listing tracked
files in .gitignore files.
---
 ...fixed.good => reference.dig.out.fixed.good} |  0
 ...om.good1 => reference.dig.out.random.good1} |  0
 ....good10 => reference.dig.out.random.good10} |  0
 ....good11 => reference.dig.out.random.good11} |  0
 ....good12 => reference.dig.out.random.good12} |  0
 ....good13 => reference.dig.out.random.good13} |  0
 ....good14 => reference.dig.out.random.good14} |  0
 ....good15 => reference.dig.out.random.good15} |  0
 ....good16 => reference.dig.out.random.good16} |  0
 ....good17 => reference.dig.out.random.good17} |  0
 ....good18 => reference.dig.out.random.good18} |  0
 ....good19 => reference.dig.out.random.good19} |  0
 ...om.good2 => reference.dig.out.random.good2} |  0
 ....good20 => reference.dig.out.random.good20} |  0
 ....good21 => reference.dig.out.random.good21} |  0
 ....good22 => reference.dig.out.random.good22} |  0
 ....good23 => reference.dig.out.random.good23} |  0
 ....good24 => reference.dig.out.random.good24} |  0
 ...om.good3 => reference.dig.out.random.good3} |  0
 ...om.good4 => reference.dig.out.random.good4} |  0
 ...om.good5 => reference.dig.out.random.good5} |  0
 ...om.good6 => reference.dig.out.random.good6} |  0
 ...om.good7 => reference.dig.out.random.good7} |  0
 ...om.good8 => reference.dig.out.random.good8} |  0
 ...om.good9 => reference.dig.out.random.good9} |  0
 bin/tests/system/rrsetorder/tests.sh           | 18 +++++++++---------
 26 files changed, 9 insertions(+), 9 deletions(-)
 rename bin/tests/system/rrsetorder/{dig.out.fixed.good => reference.dig.out.fixed.good} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good1 => reference.dig.out.random.good1} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good10 => reference.dig.out.random.good10} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good11 => reference.dig.out.random.good11} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good12 => reference.dig.out.random.good12} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good13 => reference.dig.out.random.good13} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good14 => reference.dig.out.random.good14} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good15 => reference.dig.out.random.good15} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good16 => reference.dig.out.random.good16} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good17 => reference.dig.out.random.good17} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good18 => reference.dig.out.random.good18} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good19 => reference.dig.out.random.good19} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good2 => reference.dig.out.random.good2} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good20 => reference.dig.out.random.good20} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good21 => reference.dig.out.random.good21} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good22 => reference.dig.out.random.good22} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good23 => reference.dig.out.random.good23} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good24 => reference.dig.out.random.good24} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good3 => reference.dig.out.random.good3} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good4 => reference.dig.out.random.good4} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good5 => reference.dig.out.random.good5} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good6 => reference.dig.out.random.good6} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good7 => reference.dig.out.random.good7} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good8 => reference.dig.out.random.good8} (100%)
 rename bin/tests/system/rrsetorder/{dig.out.random.good9 => reference.dig.out.random.good9} (100%)

diff --git a/bin/tests/system/rrsetorder/dig.out.fixed.good b/bin/tests/system/rrsetorder/reference.dig.out.fixed.good
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.fixed.good
rename to bin/tests/system/rrsetorder/reference.dig.out.fixed.good
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good1 b/bin/tests/system/rrsetorder/reference.dig.out.random.good1
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good1
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good1
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good10 b/bin/tests/system/rrsetorder/reference.dig.out.random.good10
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good10
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good10
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good11 b/bin/tests/system/rrsetorder/reference.dig.out.random.good11
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good11
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good11
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good12 b/bin/tests/system/rrsetorder/reference.dig.out.random.good12
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good12
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good12
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good13 b/bin/tests/system/rrsetorder/reference.dig.out.random.good13
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good13
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good13
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good14 b/bin/tests/system/rrsetorder/reference.dig.out.random.good14
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good14
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good14
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good15 b/bin/tests/system/rrsetorder/reference.dig.out.random.good15
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good15
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good15
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good16 b/bin/tests/system/rrsetorder/reference.dig.out.random.good16
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good16
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good16
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good17 b/bin/tests/system/rrsetorder/reference.dig.out.random.good17
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good17
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good17
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good18 b/bin/tests/system/rrsetorder/reference.dig.out.random.good18
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good18
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good18
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good19 b/bin/tests/system/rrsetorder/reference.dig.out.random.good19
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good19
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good19
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good2 b/bin/tests/system/rrsetorder/reference.dig.out.random.good2
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good2
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good2
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good20 b/bin/tests/system/rrsetorder/reference.dig.out.random.good20
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good20
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good20
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good21 b/bin/tests/system/rrsetorder/reference.dig.out.random.good21
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good21
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good21
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good22 b/bin/tests/system/rrsetorder/reference.dig.out.random.good22
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good22
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good22
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good23 b/bin/tests/system/rrsetorder/reference.dig.out.random.good23
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good23
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good23
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good24 b/bin/tests/system/rrsetorder/reference.dig.out.random.good24
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good24
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good24
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good3 b/bin/tests/system/rrsetorder/reference.dig.out.random.good3
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good3
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good3
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good4 b/bin/tests/system/rrsetorder/reference.dig.out.random.good4
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good4
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good4
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good5 b/bin/tests/system/rrsetorder/reference.dig.out.random.good5
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good5
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good5
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good6 b/bin/tests/system/rrsetorder/reference.dig.out.random.good6
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good6
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good6
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good7 b/bin/tests/system/rrsetorder/reference.dig.out.random.good7
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good7
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good7
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good8 b/bin/tests/system/rrsetorder/reference.dig.out.random.good8
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good8
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good8
diff --git a/bin/tests/system/rrsetorder/dig.out.random.good9 b/bin/tests/system/rrsetorder/reference.dig.out.random.good9
similarity index 100%
rename from bin/tests/system/rrsetorder/dig.out.random.good9
rename to bin/tests/system/rrsetorder/reference.dig.out.random.good9
diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index c2d94d8bd6..524efd984f 100644
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -41,7 +41,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     dig_cmd @10.53.0.1 fixed.example > dig.out.fixed || ret=1
-    diff dig.out.fixed dig.out.fixed.good >/dev/null || ret=1
+    diff dig.out.fixed reference.dig.out.fixed.good >/dev/null || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
     status=$((status + ret))
@@ -133,7 +133,7 @@ do
     match=0
     for j in $GOOD_RANDOM
     do
-	eval "diff dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+	eval "diff dig.out.random reference.dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
     done
     if [ $match -eq 0 ]; then ret=1; fi
@@ -172,7 +172,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     dig_cmd @10.53.0.2 fixed.example > dig.out.fixed || ret=1
-    diff dig.out.fixed dig.out.fixed.good || ret=1
+    diff dig.out.fixed reference.dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
     status=$((status + ret))
@@ -242,7 +242,7 @@ do
     match=0
     for j in $GOOD_RANDOM
     do
-	eval "diff dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+	eval "diff dig.out.random reference.dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
     done
     if [ $match -eq 0 ]; then ret=1; fi
@@ -297,7 +297,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     dig_cmd @10.53.0.2 fixed.example > dig.out.fixed || ret=1
-    diff dig.out.fixed dig.out.fixed.good || ret=1
+    diff dig.out.fixed reference.dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
     status=$((status + ret))
@@ -367,7 +367,7 @@ do
     match=0
     for j in $GOOD_RANDOM
     do
-	eval "diff dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+	eval "diff dig.out.random reference.dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
     done
     if [ $match -eq 0 ]; then ret=1; fi
@@ -406,7 +406,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     dig_cmd @10.53.0.3 fixed.example > dig.out.fixed || ret=1
-    diff dig.out.fixed dig.out.fixed.good || ret=1
+    diff dig.out.fixed reference.dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo_i "failed"; fi
     status=$((status + ret))
@@ -480,7 +480,7 @@ do
     match=0
     for j in $GOOD_RANDOM
     do
-	eval "diff dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+	eval "diff dig.out.random reference.dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
     done
     if [ $match -eq 0 ]; then ret=1; fi
@@ -522,7 +522,7 @@ do
     match=0
     for j in $GOOD_RANDOM
     do
-	eval "diff dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
+	eval "diff dig.out.random reference.dig.out.random.good$j >/dev/null && match$j=1 match=1"
 	if [ $match -eq 1 ]; then break; fi
     done
     if [ $match -eq 0 ]; then ret=1; fi