summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-20 04:37:25 (GMT)
commit8377f34540a33074df10ffcf27c6e90f9c88c847 (patch)
tree490553754534e06e6e2d616d89b01ecd0a1115b0 /Makefile
parent5feb8b8429b405e72b5786036774c9ffb20b64d9 (diff)
parentc9d4999155700651a37f4eb577cec1f4b5b8d6be (diff)
downloadgit-8377f34540a33074df10ffcf27c6e90f9c88c847.zip
git-8377f34540a33074df10ffcf27c6e90f9c88c847.tar.gz
git-8377f34540a33074df10ffcf27c6e90f9c88c847.tar.bz2
Merge branch 'jh/memihash-opt'
Hotfix for a topic that is already in 'master'. * jh/memihash-opt: p0004: make perf test executable t3008: skip lazy-init test on a single-core box test-online-cpus: helper to return cpu count name-hash: fix buffer overrun
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c6dbecc..eb1a1a7 100644
--- a/Makefile
+++ b/Makefile
@@ -626,6 +626,7 @@ TEST_PROGRAMS_NEED_X += test-line-buffer
TEST_PROGRAMS_NEED_X += test-match-trees
TEST_PROGRAMS_NEED_X += test-mergesort
TEST_PROGRAMS_NEED_X += test-mktemp
+TEST_PROGRAMS_NEED_X += test-online-cpus
TEST_PROGRAMS_NEED_X += test-parse-options
TEST_PROGRAMS_NEED_X += test-path-utils
TEST_PROGRAMS_NEED_X += test-prio-queue