From: Junio C Hamano Date: Wed, 21 Sep 2016 22:15:27 +0000 (-0700) Subject: Merge branch 'ks/perf-build-with-autoconf' X-Git-Tag: v2.11.0-rc0~124 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c5ff91639ab568e7cc7ecdad70a05e2888524f8?hp=ac5ce66adc252d6291b32b5b342d224cbcc2e759 Merge branch 'ks/perf-build-with-autoconf' 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 --- 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'" }