summaryrefslogtreecommitdiff
path: root/t/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 06:02:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 06:02:44 -0700
commit8d676d85f772ce3a100b6f0dddd1c34a7e4313cf (patch)
treeb6fa143842fc72a3bb2079dfdb66f30ce5126319 /t/Makefile
parentMerge branch 'bc/portable' (diff)
parenttest-lib: use DIFF definition from GIT-BUILD-OPTIONS (diff)
downloadtgif-8d676d85f772ce3a100b6f0dddd1c34a7e4313cf.tar.xz
Merge branch 'gv/portable'
* gv/portable: test-lib: use DIFF definition from GIT-BUILD-OPTIONS build: propagate $DIFF to scripts Makefile: Tru64 portability fix Makefile: HP-UX 10.20 portability fixes Makefile: HPUX11 portability fixes Makefile: SunOS 5.6 portability fix inline declaration does not work on AIX Allow disabling "inline" Some platforms lack socklen_t type Make NO_{INET_NTOP,INET_PTON} configured independently Makefile: some platforms do not have hstrerror anywhere git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition test_cmp: do not use "diff -u" on platforms that lack one fixup: do not unconditionally disable "diff -u" tests: use "test_cmp", not "diff", when verifying the result Do not use "diff" found on PATH while building and installing enums: omit trailing comma for portability Makefile: -lpthread may still be necessary when libc has only pthread stubs Rewrite dynamic structure initializations to runtime assignment Makefile: pass CPPFLAGS through to fllow customization Conflicts: Makefile wt-status.h
Diffstat (limited to 't/Makefile')
-rw-r--r--t/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/Makefile b/t/Makefile
index cd008a3c0f..f9de24b4d2 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -3,6 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
+-include ../config.mak.autogen
-include ../config.mak
#GIT_TEST_OPTS=--verbose --debug