undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/perf-on-apple' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2016-07-11 10:44:15 -07:00
commit ce22ea22e8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -82,6 +82,8 @@ before_install:
brew tap homebrew/binary --quiet brew tap homebrew/binary --quiet
brew_force_set_latest_binary_hash perforce brew_force_set_latest_binary_hash perforce
brew_force_set_latest_binary_hash perforce-server 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 install git-lfs perforce-server perforce gettext
brew link --force gettext brew link --force gettext
;; ;;

6
t/perf/perf-lib.sh
View File

@ -127,11 +127,15 @@ test_checkout_worktree () {
# Performance tests should never fail. If they do, stop immediately # Performance tests should never fail. If they do, stop immediately
immediate=t 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_run_perf_ () {
test_cleanup=: test_cleanup=:
test_export_="test_cleanup" test_export_="test_cleanup"
export test_cleanup test_export_ 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_DIRECTORY"/test-lib-functions.sh'
test_export () { test_export () {
[ $# != 0 ] || return 0 [ $# != 0 ] || return 0