Merge branch 'ks/perf-build-with-autoconf'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:27 +0000 (15:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:27 +0000 (15:15 -0700)
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

t/perf/run
index cfd70129bb70f7ed88d999421f3bc432119233c1..e8adedadfdca8549b3c4f8f8a19d383a7611f4ad 100755 (executable)
@@ -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'"
 }