mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Cirrus CI: Bump FreeBSD version to 12.2

Browse source
This commit is contained in:
Iain Buclaw 2021-08-17 11:42:25 +02:00
parent 4da47aee22
commit 037dde33d3
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -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

2
test/compilable/extra-files/ddocAny-postscript.sh
View file

@ -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}

2
test/compilable/extra-files/ddocYear-postscript.sh
View file

@ -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}

2
test/compilable/extra-files/json-postscript.sh
View file

@ -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}

2
test/compilable/extra-files/objdump-postscript.sh
View file

@ -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}

2
test/runnable/extra-files/coverage-postscript.sh
View file

@ -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}

2
test/runnable/extra-files/hello-profile-postscript.sh
View file

@ -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

2
test/tools/d_do_test.d
View file

@ -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;