From c5909a7a1bf6045a3b9ef2efddeaf2762ab805f7 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 14 May 2022 00:00:58 +0200 Subject: [PATCH] tests: improve the output on macOS --- tests/tests.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/tests.sh b/tests/tests.sh index 2429670..889b836 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -20,9 +20,23 @@ PROGNAME="tests.sh" #executables DATE="date" +ECHO="echo" +UNAME="uname" +[ $($UNAME -s) != "Darwin" ] || ECHO="/bin/echo" #functions +#date +_date() +{ + if [ -n "$SOURCE_DATE_EPOCH" ]; then + TZ=UTC $DATE -d "@$SOURCE_DATE_EPOCH" '+%a %b %d %T %Z %Y' + else + $DATE + fi +} + + #fail _fail() { @@ -36,7 +50,7 @@ _run() test="$1" shift - echo -n "$test:" 1>&2 + $ECHO -n "$test:" 1>&2 (echo echo "Testing: $OBJDIR$test" "$@" LD_LIBRARY_PATH="$OBJDIR../src" "$OBJDIR$test" "$@") 2>&1 @@ -102,7 +116,7 @@ while [ $# -ge 1 ]; do target="$1" shift - $DATE > "$target" + _date > "$target" FAILED= echo "Performing tests:" 1>&2 _test "user"