mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-05 16:58:00 +02:00
When running TAP tests, filter out trailing \r from Windows .exe
If we're running Windows executables using Wine, then tap-driver.sh won't accept "1..4\r\n" as TAP syntax. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92538 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
parent
24b6eecc66
commit
24342d5912
1 changed files with 21 additions and 1 deletions
|
|
@ -10,4 +10,24 @@
|
|||
set -e
|
||||
t="$1"
|
||||
shift
|
||||
exec "$t" --tap "$@"
|
||||
|
||||
case "$t" in
|
||||
(*.exe)
|
||||
# We're running a Windows executable, possibly on a Unix
|
||||
# platform. Avoid having invalid TAP syntax like "ok 3\r\n"
|
||||
# where "ok 3\n" was intended.
|
||||
echo 1 > "$t".exit-status.tmp
|
||||
(
|
||||
set +e
|
||||
"$t" --tap "$@"
|
||||
echo "$?" > "$t".exit-status.tmp
|
||||
) | sed -e 's/\r$//'
|
||||
e="$(cat "$t".exit-status.tmp)"
|
||||
rm "$t".exit-status.tmp
|
||||
exit "$e"
|
||||
;;
|
||||
|
||||
(*)
|
||||
exec "$t" --tap "$@"
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue