From 037dde33d338c2f09b7a23f1cb8be211039d04e1 Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Tue, 17 Aug 2021 11:42:25 +0200
Subject: [PATCH] Cirrus CI: Bump FreeBSD version to 12.2

---
 .cirrus.yml                                           | 4 ++--
 test/compilable/extra-files/ddocAny-postscript.sh     | 2 +-
 test/compilable/extra-files/ddocYear-postscript.sh    | 2 +-
 test/compilable/extra-files/json-postscript.sh        | 2 +-
 test/compilable/extra-files/objdump-postscript.sh     | 2 +-
 test/runnable/extra-files/coverage-postscript.sh      | 2 +-
 test/runnable/extra-files/hello-profile-postscript.sh | 2 +-
 test/tools/d_do_test.d                                | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 07b0133684..dc13ff53e0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -105,9 +105,9 @@ task:
 
 # FreeBSD
 task:
-  name: FreeBSD 12.1 x64, DMD ($TASK_NAME_TYPE)
+  name: FreeBSD 12.2 x64, DMD ($TASK_NAME_TYPE)
   freebsd_instance:
-    image_family: freebsd-12-1
+    image_family: freebsd-12-2
     cpu: 4
     memory: 8G
   timeout_in: 60m
diff --git a/test/compilable/extra-files/ddocAny-postscript.sh b/test/compilable/extra-files/ddocAny-postscript.sh
index d72c96de83..777e210d87 100755
--- a/test/compilable/extra-files/ddocAny-postscript.sh
+++ b/test/compilable/extra-files/ddocAny-postscript.sh
@@ -3,6 +3,6 @@
 source tools/common_funcs.sh
 
 grep --text -v "Generated by Ddoc from" ${OUTPUT_BASE}.html > ${OUTPUT_BASE}.html.2
-diff -pu --strip-trailing-cr ${EXTRA_FILES}/${TEST_NAME}.html ${OUTPUT_BASE}.html.2
+diff -up --strip-trailing-cr ${EXTRA_FILES}/${TEST_NAME}.html ${OUTPUT_BASE}.html.2
 
 rm_retry ${OUTPUT_BASE}.html{,.2}
diff --git a/test/compilable/extra-files/ddocYear-postscript.sh b/test/compilable/extra-files/ddocYear-postscript.sh
index eebc6d5a6c..3f2e510474 100755
--- a/test/compilable/extra-files/ddocYear-postscript.sh
+++ b/test/compilable/extra-files/ddocYear-postscript.sh
@@ -7,6 +7,6 @@ YEAR=$(date +%Y)
 grep "__YEAR__" ${EXTRA_FILES}/${TEST_NAME}.html
 sed "s/__YEAR__/${YEAR}/" ${EXTRA_FILES}/${TEST_NAME}.html > ${OUTPUT_BASE}.html.1
 grep -v "Generated by Ddoc from" ${OUTPUT_BASE}.html > ${OUTPUT_BASE}.html.2
-diff -pu --strip-trailing-cr ${OUTPUT_BASE}.html.1 ${OUTPUT_BASE}.html.2
+diff -up --strip-trailing-cr ${OUTPUT_BASE}.html.1 ${OUTPUT_BASE}.html.2
 
 rm_retry ${OUTPUT_BASE}.html{,.1,.2}
diff --git a/test/compilable/extra-files/json-postscript.sh b/test/compilable/extra-files/json-postscript.sh
index 4d3106f810..52d2d7915b 100755
--- a/test/compilable/extra-files/json-postscript.sh
+++ b/test/compilable/extra-files/json-postscript.sh
@@ -5,6 +5,6 @@ source tools/common_funcs.sh
 echo SANITIZING JSON...
 ${RESULTS_DIR}/sanitize_json ${OUTPUT_BASE}.out > ${OUTPUT_BASE}.out.sanitized
 
-diff -pu --strip-trailing-cr ${EXTRA_FILES}/${TEST_NAME}.json ${OUTPUT_BASE}.out.sanitized
+diff -up --strip-trailing-cr ${EXTRA_FILES}/${TEST_NAME}.json ${OUTPUT_BASE}.out.sanitized
 
 rm_retry ${OUTPUT_BASE}.out{,.sanitized}
diff --git a/test/compilable/extra-files/objdump-postscript.sh b/test/compilable/extra-files/objdump-postscript.sh
index 99fd25455d..9a277a3e94 100644
--- a/test/compilable/extra-files/objdump-postscript.sh
+++ b/test/compilable/extra-files/objdump-postscript.sh
@@ -12,6 +12,6 @@ echo SANITIZING Objdump...
 < "${obj_file}.dump" \
     tail -n+3 > "${obj_file}.dump.sanitized"
 
-diff -pu --strip-trailing-cr "${expect_file}" "${obj_file}.dump.sanitized"
+diff -up --strip-trailing-cr "${expect_file}" "${obj_file}.dump.sanitized"
 
 rm_retry "${OUTPUT_BASE}.o"{,.dump,.dump,.sanitized}
diff --git a/test/runnable/extra-files/coverage-postscript.sh b/test/runnable/extra-files/coverage-postscript.sh
index 10c979c9f4..cfbdb03551 100755
--- a/test/runnable/extra-files/coverage-postscript.sh
+++ b/test/runnable/extra-files/coverage-postscript.sh
@@ -7,6 +7,6 @@ out_file=${RESULTS_TEST_DIR}/${TEST_DIR}-${TEST_NAME}.lst
 LINE_COUNT_MINUS_1=$(( `wc -l < ${out_file}` - 1 ))
 head -n${LINE_COUNT_MINUS_1} ${out_file} > ${out_file}2
 
-diff -pu --strip-trailing-cr ${EXTRA_FILES}/${TEST_DIR}-${TEST_NAME}.lst ${out_file}2
+diff -up --strip-trailing-cr ${EXTRA_FILES}/${TEST_DIR}-${TEST_NAME}.lst ${out_file}2
 
 rm_retry ${out_file}{,2}
diff --git a/test/runnable/extra-files/hello-profile-postscript.sh b/test/runnable/extra-files/hello-profile-postscript.sh
index 3eb47a1bd4..47c18c0895 100755
--- a/test/runnable/extra-files/hello-profile-postscript.sh
+++ b/test/runnable/extra-files/hello-profile-postscript.sh
@@ -5,7 +5,7 @@ source tools/common_funcs.sh
 # strip out Dmain since it's symbol differs between windows and non-windows
 grep -v Dmain ${OUTPUT_BASE}.d.trace.def > ${OUTPUT_BASE}.d.trace.def2
 
-diff -pu --strip-trailing-cr ${EXTRA_FILES}/${TEST_NAME}.d.trace.def ${OUTPUT_BASE}.d.trace.def2
+diff -up --strip-trailing-cr ${EXTRA_FILES}/${TEST_NAME}.d.trace.def ${OUTPUT_BASE}.d.trace.def2
 
 tracelog=${OUTPUT_BASE}.d.trace.log
 if [ ! -f ${tracelog} ]; then
diff --git a/test/tools/d_do_test.d b/test/tools/d_do_test.d
index f21856fa44..4dcaba3275 100755
--- a/test/tools/d_do_test.d
+++ b/test/tools/d_do_test.d
@@ -1191,7 +1191,7 @@ string generateDiff(const string expected, string expectedFile,
     scope (exit) if (needTmp)
         tryRemove(expectedFile);
 
-    const cmd = ["diff", "-pu", "--strip-trailing-cr", expectedFile, actualFile];
+    const cmd = ["diff", "-up", "--strip-trailing-cr", expectedFile, actualFile];
     try
     {
         string diff = std.process.execute(cmd).output;