diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:15 -0700 |
| commit | ce22ea22e863e100529334b02b2899780d2c9dcc (patch) | |
| tree | 7753b9bd212296c9f704019db1f854b31b6be759 /t | |
| parent | c4cdde45f0e8111ab7aac03ddb9a89ef1029fb50 (diff) | |
| parent | e3efa94be985c398b2118c3c7f7f9bfe3d056687 (diff) | |
| download | git-ce22ea22e863e100529334b02b2899780d2c9dcc.tar.gz git-ce22ea22e863e100529334b02b2899780d2c9dcc.tar.xz | |
Merge branch 'js/perf-on-apple' into maint
t/perf needs /usr/bin/time with GNU extension; the invocation of it
is updated to "gtime" on Darwin.
* js/perf-on-apple:
perf: accommodate for MacOSX
Diffstat (limited to 't')
| -rw-r--r-- | t/perf/perf-lib.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 18c363ea7..773f955d4 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -127,11 +127,15 @@ test_checkout_worktree () { # Performance tests should never fail. If they do, stop immediately immediate=t +# Perf tests require GNU time +case "$(uname -s)" in Darwin) GTIME="${GTIME:-gtime}";; esac +GTIME="${GTIME:-/usr/bin/time}" + test_run_perf_ () { test_cleanup=: test_export_="test_cleanup" export test_cleanup test_export_ - /usr/bin/time -f "%E %U %S" -o test_time.$i "$SHELL" -c ' + "$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c ' . '"$TEST_DIRECTORY"/test-lib-functions.sh' test_export () { [ $# != 0 ] || return 0 |