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 | |
| parent | Merge branch 'ak/t7800-wo-readlink' into maint (diff) | |
| parent | perf: accommodate for MacOSX (diff) | |
| download | tgif-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
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | t/perf/perf-lib.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c20ec540c8..c2b76f9b7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,6 +82,8 @@ before_install: brew tap homebrew/binary --quiet brew_force_set_latest_binary_hash perforce brew_force_set_latest_binary_hash perforce-server + # Uncomment this if you want to run perf tests: + # brew install gnu-time brew install git-lfs perforce-server perforce gettext brew link --force gettext ;; diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 18c363ea7f..773f955d4a 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 |