summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:49:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-29 16:49:40 -0700
commit08d0f7a5317d80cbb93f80791f2759fb6aec890f (patch)
treeea24002a5469c2b6be5187b3334b4c12e4c5fe73
parentMerge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint (diff)
parentt/perf/run: copy config.mak.autogen & friends to build area (diff)
downloadtgif-08d0f7a5317d80cbb93f80791f2759fb6aec890f.tar.xz
Merge branch 'ks/perf-build-with-autoconf' into maint
Performance tests done via "t/perf" did not use the same set of build configuration if the user relied on autoconf generated configuration. * ks/perf-build-with-autoconf: t/perf/run: copy config.mak.autogen & friends to build area
-rwxr-xr-xt/perf/run8
1 files changed, 7 insertions, 1 deletions
diff --git a/t/perf/run b/t/perf/run
index cfd70129bb..e8adedadfd 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -30,7 +30,13 @@ unpack_git_rev () {
}
build_git_rev () {
rev=$1
- cp ../../config.mak build/$rev/config.mak
+ for config in config.mak config.mak.autogen config.status
+ do
+ if test -e "../../$config"
+ then
+ cp "../../$config" "build/$rev/"
+ fi
+ done
(cd build/$rev && make $GIT_PERF_MAKE_OPTS) ||
die "failed to build revision '$mydir'"
}