Merge pull request #863 from dag-erling/des/fix-xmltest-log

Don't require dos2unix.

.github/workflows/coverage.yml

@@ -61,7 +61,6 @@ jobs:
             cmake \
             docbook-xml \
             docbook2x \
-            dos2unix \
             gcc-multilib \
             g++-multilib \
             lcov \

.github/workflows/linux.yml

@@ -130,7 +130,6 @@ jobs:
         sudo apt-get install --yes --no-install-recommends -V \
             cmake \
             docbook2x \
-            dos2unix \
             gcc-multilib \
             g++-multilib \
             lcov \

Brewfile

@@ -2,7 +2,6 @@ brew "autoconf"
 brew "automake"
 brew "cmake"
 brew "docbook2x"
-brew "dos2unix"
 brew "gcc"
 brew "gettext"
 brew "ghostscript"

expat/fix-xmltest-log.sh

@@ -32,10 +32,10 @@ set -e
 
 filename="${1:-tests/xmltest.log}"
 
-dos2unix "${filename}"
-
-tempfile="$(mktemp)"
-sed \
+sed -i.bak \
+        -e '# convert DOS line endings to Unix without resorting to dos2unix' \
+        -e $'s/\r//' \
+        \
         -e 's/^wine: Call .* msvcrt\.dll\._wperror, aborting$/ibm49i02.dtd: No such file or directory/' \
         \
         -e '/^wine: /d' \
@@ -46,5 +46,4 @@ sed \
         -e '/^wine client error:/d' \
         -e '/^In ibm\/invalid\/P49\/: Unhandled exception: unimplemented .\+/d' \
         \
-        "${filename}" > "${tempfile}"
-mv "${tempfile}" "${filename}"
+        "${filename}"