From 725fbdf921d0048b08af3fb77d3ffb26b6bf8352 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 18 Jan 2014 14:52:26 +0100 Subject: [PATCH] Try to become able to use a time builtin again. Fixes timing on msys. --- misc/tools/all/config.subr | 14 +++++++++++--- misc/tools/all/git.subr | 4 ++-- misc/tools/all/xonotic.subr | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr index 1c560fa9..38a90bde 100644 --- a/misc/tools/all/config.subr +++ b/misc/tools/all/config.subr @@ -35,10 +35,18 @@ allmirrors() "$@" ssh push ssh://xonotic@push.git.xonotic.org/ '' } -time="time -p" -if { $time sh -c 'true'; } 2>&1 >/dev/null | grep '^user ' >/dev/null; then +have_time=true +measure_time() +{ + if $have_time; then + time -p "$@" + else + "$@" + fi +} +if { measure_time sh -c 'true'; } 2>&1 >/dev/null | grep '^user ' >/dev/null; then msg "Timing via the time utility works." else - time= + have_time=false msg "Timing not supported." fi diff --git a/misc/tools/all/git.subr b/misc/tools/all/git.subr index c29685dc..5c8d53dc 100644 --- a/misc/tools/all/git.subr +++ b/misc/tools/all/git.subr @@ -56,7 +56,7 @@ mirrorspeed() # first result is to be ignored, but we use it to check status git ls-remote "$1" refs/heads/master >/dev/null 2>&1 || return 1 # if we can't time, we only check availability - if [ -z "$time" ]; then + if ! $have_time; then echo 0 return fi @@ -64,7 +64,7 @@ mirrorspeed() ( set +x export REPO=$1 # so that the sh -c subshell can use it - { $time sh -c 'git ls-remote "$REPO" refs/heads/master >/dev/null 2>&1'; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,' | grep . || echo 0 + { measure_time sh -c 'git ls-remote "$REPO" refs/heads/master >/dev/null 2>&1'; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,' | grep . || echo 0 # unit: clock ticks (depends on what "time" returns ) } diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 2d7025f9..96a82a30 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -17,7 +17,7 @@ case "$cmd" in if [ ! -f "$mapfile" ] ; then msg "ERROR, $mapfile not found!" else - verbose $time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" + verbose measure_time misc/tools/xonotic-map-compiler-optionsfile "$mapfile" fi done ;; @@ -336,7 +336,7 @@ case "$cmd" in set -- rlwrap -A -g '^quit' -q "\"" -s 10000 -S ']' -w 100 "$@" fi rm -f xonotic.core - verbose $time "$@" || true + verbose measure_time "$@" || true if [ -f xonotic.core ]; then if yesno "The program has CRASHED. Do you want to examine the core dump?"; then gdb "$binary" xonotic.core -- 2.39.2