From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 4 Sep 2010 15:15:36 +0000 (-0700)
Subject: Merge branch 'ab/test-2'
X-Git-Tag: v1.7.3-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a2c6726417db22bea7a878aeb88e18bcc95e5c0c?hp=-c

Merge branch 'ab/test-2'

* ab/test-2: (51 commits)
tests: factor HOME=$(pwd) in test-lib.sh
test-lib: use subshell instead of cd $new && .. && cd $old
tests: simplify "missing PREREQ" message
t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
test-lib: Allow overriding of TEST_DIRECTORY
test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
test: Introduce $GIT_BUILD_DIR
cvs tests: do not touch test CVS repositories shipped with source
t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
t/t7105-reset-patch.sh: Add a PERL prerequisite
t/t9001-send-email.sh: convert setup code to tests
t/t9001-send-email.sh: change from skip_all=* to prereq skip
t/t9001-send-email.sh: Remove needless PROG=* assignment
t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
lib-patch-mode tests: change from skip_all=* to prereq skip
t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
t/Makefile: Create test-results dir for smoke target
...

Conflicts:
t/t6035-merge-dir-to-symlink.sh
---

a2c6726417db22bea7a878aeb88e18bcc95e5c0c
diff --combined .gitignore
index 4cb14e0bae,0a30a7e97c..20560b810b
--- a/.gitignore
+++ b/.gitignore
@@@ -158,7 -158,7 +158,7 @@@
  /gitk-git/gitk-wish
  /gitweb/GITWEB-BUILD-OPTIONS
  /gitweb/gitweb.cgi
 -/gitweb/gitweb.min.*
 +/gitweb/static/gitweb.min.*
  /test-chmtime
  /test-ctype
  /test-date
@@@ -166,17 -166,12 +166,17 @@@
  /test-dump-cache-tree
  /test-genrandom
  /test-index-version
 +/test-line-buffer
  /test-match-trees
 +/test-obj-pool
  /test-parse-options
  /test-path-utils
  /test-run-command
  /test-sha1
  /test-sigchain
 +/test-string-pool
 +/test-svn-fe
 +/test-treap
  /common-cmds.h
  *.tar.gz
  *.dsc
@@@ -186,6 -181,12 +186,12 @@@
  *.[aos]
  *.py[co]
  .depend/
+ *.gcda
+ *.gcno
+ *.gcov
+ /coverage-untested-functions
+ /cover_db/
+ /cover_db_html/
  *+
  /config.mak
  /autom4te.cache
diff --combined Makefile
index 40fbcaee93,194c26fc5e..8b7c243473
--- a/Makefile
+++ b/Makefile
@@@ -68,8 -68,6 +68,8 @@@ all:
  #
  # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
  #
 +# Define NO_STRTOK_R if you don't have strtok_r in the C library.
 +#
  # Define NO_LIBGEN_H if you don't have libgen.h.
  #
  # Define NEEDS_LIBGEN if your libgen needs -lgen when linking
@@@ -310,6 -308,7 +310,7 @@@ TCL_PATH = tcls
  TCLTK_PATH = wish
  PTHREAD_LIBS = -lpthread
  PTHREAD_CFLAGS =
+ GCOV = gcov
  
  export TCL_PATH TCLTK_PATH
  
@@@ -410,17 -409,12 +411,17 @@@ TEST_PROGRAMS_NEED_X += test-dat
  TEST_PROGRAMS_NEED_X += test-delta
  TEST_PROGRAMS_NEED_X += test-dump-cache-tree
  TEST_PROGRAMS_NEED_X += test-genrandom
 +TEST_PROGRAMS_NEED_X += test-line-buffer
  TEST_PROGRAMS_NEED_X += test-match-trees
 +TEST_PROGRAMS_NEED_X += test-obj-pool
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
  TEST_PROGRAMS_NEED_X += test-run-command
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
 +TEST_PROGRAMS_NEED_X += test-string-pool
 +TEST_PROGRAMS_NEED_X += test-svn-fe
 +TEST_PROGRAMS_NEED_X += test-treap
  TEST_PROGRAMS_NEED_X += test-index-version
  
  TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
@@@ -475,7 -469,6 +476,7 @@@ export PYTHON_PAT
  
  LIB_FILE=libgit.a
  XDIFF_LIB=xdiff/lib.a
 +VCSSVN_LIB=vcs-svn/lib.a
  
  LIB_H += advice.h
  LIB_H += archive.h
@@@ -1043,7 -1036,6 +1044,7 @@@ ifeq ($(uname_S),Windows
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 +	NO_STRTOK_R = YesPlease
  	NO_MEMMEM = YesPlease
  	# NEEDS_LIBICONV = YesPlease
  	NO_ICONV = YesPlease
@@@ -1098,7 -1090,6 +1099,7 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 +	NO_STRTOK_R = YesPlease
  	NO_MEMMEM = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	OLD_ICONV = YesPlease
@@@ -1329,10 -1320,6 +1330,10 @@@ endi
  ifdef NO_STRTOULL
  	COMPAT_CFLAGS += -DNO_STRTOULL
  endif
 +ifdef NO_STRTOK_R
 +	COMPAT_CFLAGS += -DNO_STRTOK_R
 +	COMPAT_OBJS += compat/strtok_r.o
 +endif
  ifdef NO_SETENV
  	COMPAT_CFLAGS += -DNO_SETENV
  	COMPAT_OBJS += compat/setenv.o
@@@ -1499,6 -1486,7 +1500,7 @@@ ifndef 
  	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
  	QUIET_GEN      = @echo '   ' GEN $@;
  	QUIET_LNCP     = @echo '   ' LN/CP $@;
+ 	QUIET_GCOV     = @echo '   ' GCOV $@;
  	QUIET_SUBDIR0  = +@subdir=
  	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
  			 $(MAKE) $(PRINT_DIR) -C $$subdir
@@@ -1753,9 -1741,7 +1755,9 @@@ ifndef NO_CUR
  endif
  XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
  	xdiff/xmerge.o xdiff/xpatience.o
 -OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)
 +VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \
 +	vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o
 +OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
  
  dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
  dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
@@@ -1877,11 -1863,6 +1879,11 @@@ http.o http-walker.o http-push.o http-f
  xdiff-interface.o $(XDIFF_OBJS): \
  	xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
  	xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
 +
 +$(VCSSVN_OBJS): \
 +	vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \
 +	vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
 +	vcs-svn/svndump.h
  endif
  
  exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
@@@ -1894,16 -1875,12 +1896,16 @@@ builtin/init-db.s builtin/init-db.o: EX
  
  config.s config.o: EXTRA_CPPFLAGS = -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
  
 -http.s http.o: EXTRA_CPPFLAGS = -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
 +http.s http.o: EXTRA_CPPFLAGS = -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
  
  ifdef NO_EXPAT
  http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif
  
 +ifdef NO_REGEX
 +compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
 +endif
 +
  git-%$X: %.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
@@@ -1934,8 -1911,6 +1936,8 @@@ $(LIB_FILE): $(LIB_OBJS
  $(XDIFF_LIB): $(XDIFF_OBJS)
  	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
  
 +$(VCSSVN_LIB): $(VCSSVN_OBJS)
 +	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
  
  doc:
  	$(MAKE) -C Documentation all
@@@ -2034,18 -2009,12 +2036,18 @@@ test-date$X: date.o ctype.
  
  test-delta$X: diff-delta.o patch-delta.o
  
 +test-line-buffer$X: vcs-svn/lib.a
 +
  test-parse-options$X: parse-options.o
  
 +test-string-pool$X: vcs-svn/lib.a
 +
 +test-svn-fe$X: vcs-svn/lib.a
 +
  .PRECIOUS: $(TEST_OBJS)
  
  test-%$X: test-%.o $(GITLIBS)
 -	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
  
  check-sha1:: test-sha1$X
  	./test-sha1.sh
@@@ -2220,8 -2189,8 +2222,8 @@@ distclean: clea
  	$(RM) configure
  
  clean:
 -	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
 -		builtin/*.o $(LIB_FILE) $(XDIFF_LIB)
 +	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
 +		builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)
  	$(RM) -r bin-wrappers
@@@ -2324,11 -2293,18 +2326,18 @@@ coverage
  	$(MAKE) coverage-build
  	$(MAKE) coverage-report
  
+ object_dirs := $(sort $(dir $(OBJECTS)))
  coverage-clean:
- 	rm -f *.gcda *.gcno
+ 	$(RM) $(addsuffix *.gcov,$(object_dirs))
+ 	$(RM) $(addsuffix *.gcda,$(object_dirs))
+ 	$(RM) $(addsuffix *.gcno,$(object_dirs))
+ 	$(RM) coverage-untested-functions
+ 	$(RM) -r cover_db/
+ 	$(RM) -r cover_db_html/
  
  COVERAGE_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
  COVERAGE_LDFLAGS = $(CFLAGS)  -O0 -lgcov
+ GCOVFLAGS = --preserve-paths --branch-probabilities --all-blocks
  
  coverage-build: coverage-clean
  	$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" all
@@@ -2336,7 -2312,17 +2345,17 @@@
  		-j1 test
  
  coverage-report:
- 	gcov -b *.c
+ 	$(QUIET_GCOV)for dir in $(object_dirs); do \
+ 		$(GCOV) $(GCOVFLAGS) --object-directory=$$dir $$dir*.c || exit; \
+ 	done
+ 
+ coverage-untested-functions: coverage-report
  	grep '^function.*called 0 ' *.c.gcov \
  		| sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
- 		| tee coverage-untested-functions
+ 		> coverage-untested-functions
+ 
+ cover_db: coverage-report
+ 	gcov2perl -db cover_db *.gcov
+ 
+ cover_db_html: cover_db
+ 	cover -report html -outputdir cover_db_html cover_db
diff --combined t/README
index 410499a096,118e50df72..a1eb7c8720
--- a/t/README
+++ b/t/README
@@@ -268,6 -268,18 +268,18 @@@ Do
  	git push gh &&
  	test ...
  
+  - Check the test coverage for your tests. See the "Test coverage"
+    below.
+ 
+    Don't blindly follow test coverage metrics, they're a good way to
+    spot if you've missed something. If a new function you added
+    doesn't have any coverage you're probably doing something wrong,
+    but having 100% coverage doesn't necessarily mean that you tested
+    everything.
+ 
+    Tests that are likely to smoke out future regressions are better
+    than tests that just inflate the coverage metrics.
+ 
  Don't:
  
   - exit() within a <script> part.
@@@ -307,9 -319,21 +319,21 @@@ Keep in mind
  Skipping tests
  --------------
  
- If you need to skip all the remaining tests you should set skip_all
- and immediately call test_done. The string you give to skip_all will
- be used as an explanation for why the test was skipped. for instance:
+ If you need to skip tests you should do so be using the three-arg form
+ of the test_* functions (see the "Test harness library" section
+ below), e.g.:
+ 
+     test_expect_success PERL 'I need Perl' "
+         '$PERL_PATH' -e 'hlagh() if unf_unf()'
+     "
+ 
+ The advantage of skipping tests like this is that platforms that don't
+ have the PERL and other optional dependencies get an indication of how
+ many tests they're missing.
+ 
+ If the test code is too hairy for that (i.e. does a lot of setup work
+ outside test assertions) you can also skip all remaining tests by
+ setting skip_all and immediately call test_done:
  
  	if ! test_have_prereq PERL
  	then
@@@ -317,6 -341,9 +341,9 @@@
  	    test_done
  	fi
  
+ The string you give to skip_all will be used as an explanation for why
+ the test was skipped.
+ 
  End with test_done
  ------------------
  
@@@ -350,6 -377,12 +377,12 @@@ library for your script to use
  	test_expect_success TTY 'git --paginate rev-list uses a pager' \
  	    ' ... '
  
+    You can also supply a comma-separated list of prerequisites, in the
+    rare case where your test depends on more than one:
+ 
+ 	test_expect_success PERL,PYTHON 'yo dawg' \
+ 	    ' test $(perl -E 'print eval "1 +" . qx[python -c "print 2"]') == "4" '
+ 
   - test_expect_failure [<prereq>] <message> <script>
  
     This is NOT the opposite of test_expect_success, but is used
@@@ -404,11 -437,12 +437,12 @@@
   - test_set_prereq SOME_PREREQ
  
     Set a test prerequisite to be used later with test_have_prereq. The
-    test-lib will set some prerequisites for you, e.g. PERL and PYTHON
-    which are derived from ./GIT-BUILD-OPTIONS (grep test_set_prereq
-    test-lib.sh for more). Others you can set yourself and use later
-    with either test_have_prereq directly, or the three argument
-    invocation of test_expect_success and test_expect_failure.
+    test-lib will set some prerequisites for you, see the
+    "Prerequisites" section below for a full list of these.
+ 
+    Others you can set yourself and use later with either
+    test_have_prereq directly, or the three argument invocation of
+    test_expect_success and test_expect_failure.
  
   - test_have_prereq SOME PREREQ
  
@@@ -467,13 -501,6 +501,13 @@@
     <expected> file.  This behaves like "cmp" but produces more
     helpful output when the test is run with "-v" option.
  
 + - test_path_is_file <file> [<diagnosis>]
 +   test_path_is_dir <dir> [<diagnosis>]
 +   test_path_is_missing <path> [<diagnosis>]
 +
 +   Check whether a file/directory exists or doesn't. <diagnosis> will
 +   be displayed if the test fails.
 +
   - test_when_finished <script>
  
     Prepend <script> to a list of commands to run to clean up
@@@ -488,6 -515,45 +522,45 @@@
  		...
  	'
  
+ Prerequisites
+ -------------
+ 
+ These are the prerequisites that the test library predefines with
+ test_have_prereq.
+ 
+ See the prereq argument to the test_* functions in the "Test harness
+ library" section above and the "test_have_prereq" function for how to
+ use these, and "test_set_prereq" for how to define your own.
+ 
+  - PERL & PYTHON
+ 
+    Git wasn't compiled with NO_PERL=YesPlease or
+    NO_PYTHON=YesPlease. Wrap any tests that need Perl or Python in
+    these.
+ 
+  - POSIXPERM
+ 
+    The filesystem supports POSIX style permission bits.
+ 
+  - BSLASHPSPEC
+ 
+    Backslashes in pathspec are not directory separators. This is not
+    set on Windows. See 6fd1106a for details.
+ 
+  - EXECKEEPSPID
+ 
+    The process retains the same pid across exec(2). See fb9a2bea for
+    details.
+ 
+  - SYMLINKS
+ 
+    The filesystem we're on supports symbolic links. E.g. a FAT
+    filesystem doesn't support these. See 704a3143 for details.
+ 
+  - SANITY
+ 
+    Test is not run by root user, and an attempt to write to an
+    unwritable file is expected to fail correctly.
  
  Tips for Writing Tests
  ----------------------
@@@ -515,3 -581,115 +588,115 @@@ the purpose of t0000-basic.sh, which i
  validation in one place.  Your test also ends up needing
  updating when such a change to the internal happens, so do _not_
  do it and leave the low level of validation to t0000-basic.sh.
+ 
+ Test coverage
+ -------------
+ 
+ You can use the coverage tests to find code paths that are not being
+ used or properly exercised yet.
+ 
+ To do that, run the coverage target at the top-level (not in the t/
+ directory):
+ 
+     make coverage
+ 
+ That'll compile Git with GCC's coverage arguments, and generate a test
+ report with gcov after the tests finish. Running the coverage tests
+ can take a while, since running the tests in parallel is incompatible
+ with GCC's coverage mode.
+ 
+ After the tests have run you can generate a list of untested
+ functions:
+ 
+     make coverage-untested-functions
+ 
+ You can also generate a detailed per-file HTML report using the
+ Devel::Cover module. To install it do:
+ 
+    # On Debian or Ubuntu:
+    sudo aptitude install libdevel-cover-perl
+ 
+    # From the CPAN with cpanminus
+    curl -L http://cpanmin.us | perl - --sudo --self-upgrade
+    cpanm --sudo Devel::Cover
+ 
+ Then, at the top-level:
+ 
+     make cover_db_html
+ 
+ That'll generate a detailed cover report in the "cover_db_html"
+ directory, which you can then copy to a webserver, or inspect locally
+ in a browser.
+ 
+ Smoke testing
+ -------------
+ 
+ The Git test suite has support for smoke testing. Smoke testing is
+ when you submit the results of a test run to a central server for
+ analysis and aggregation.
+ 
+ Running a smoke tester is an easy and valuable way of contributing to
+ Git development, particularly if you have access to an uncommon OS on
+ obscure hardware.
+ 
+ After building Git you can generate a smoke report like this in the
+ "t" directory:
+ 
+     make clean smoke
+ 
+ You can also pass arguments via the environment. This should make it
+ faster:
+ 
+     GIT_TEST_OPTS='--root=/dev/shm' TEST_JOBS=10 make clean smoke
+ 
+ The "smoke" target will run the Git test suite with Perl's
+ "TAP::Harness" module, and package up the results in a .tar.gz archive
+ with "TAP::Harness::Archive". The former is included with Perl v5.10.1
+ or later, but you'll need to install the latter from the CPAN. See the
+ "Test coverage" section above for how you might do that.
+ 
+ Once the "smoke" target finishes you'll see a message like this:
+ 
+     TAP Archive created at <path to git>/t/test-results/git-smoke.tar.gz
+ 
+ To upload the smoke report you need to have curl(1) installed, then
+ do:
+ 
+     make smoke_report
+ 
+ To upload the report anonymously. Hopefully that'll return something
+ like "Reported #7 added.".
+ 
+ If you're going to be uploading reports frequently please request a
+ user account by E-Mailing gitsmoke@v.nix.is. Once you have a username
+ and password you'll be able to do:
+ 
+     SMOKE_USERNAME=<username> SMOKE_PASSWORD=<password> make smoke_report
+ 
+ You can also add an additional comment to attach to the report, and/or
+ a comma separated list of tags:
+ 
+     SMOKE_USERNAME=<username> SMOKE_PASSWORD=<password> \
+         SMOKE_COMMENT=<comment> SMOKE_TAGS=<tags> \
+         make smoke_report
+ 
+ Once the report is uploaded it'll be made available at
+ http://smoke.git.nix.is, here's an overview of Recent Smoke Reports
+ for Git:
+ 
+     http://smoke.git.nix.is/app/projects/smoke_reports/1
+ 
+ The reports will also be mirrored to GitHub every few hours:
+ 
+     http://github.com/gitsmoke/smoke-reports
+ 
+ The Smolder SQLite database is also mirrored and made available for
+ download:
+ 
+     http://github.com/gitsmoke/smoke-database
+ 
+ Note that the database includes hashed (with crypt()) user passwords
+ and E-Mail addresses. Don't use a valuable password for the smoke
+ service if you have an account, or an E-Mail address you don't want to
+ be publicly known. The user accounts are just meant to be convenient
+ labels, they're not meant to be secure.
diff --combined t/t3302-notes-index-expensive.sh
index 8ab333dbd9,7c08e99c48..e35d7811ac
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@@ -7,11 -7,9 +7,9 @@@ test_description='Test commit notes ind
  
  . ./test-lib.sh
  
- test -z "$GIT_NOTES_TIMING_TESTS" && {
- 	skip_all="Skipping timing tests"
- 	test_done
- 	exit
- }
+ test_set_prereq NOT_EXPENSIVE
+ test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
+ test -x /usr/bin/time && test_set_prereq USR_BIN_TIME
  
  create_repo () {
  	number_of_commits=$1
@@@ -98,21 -96,31 +96,31 @@@ time_notes () 
  	for mode in no-notes notes
  	do
  		echo $mode
 -		/usr/bin/time sh ../time_notes $mode $1
 +		/usr/bin/time "$SHELL_PATH" ../time_notes $mode $1
  	done
  }
  
- for count in 10 100 1000 10000; do
+ do_tests () {
+ 	pr=$1
+ 	count=$2
+ 
+ 	test_expect_success $pr 'setup / mkdir' '
+ 		mkdir $count &&
+ 		cd $count
+ 	'
  
- 	mkdir $count
- 	(cd $count;
+ 	test_expect_success $pr "setup $count" "create_repo $count"
  
- 	test_expect_success "setup $count" "create_repo $count"
+ 	test_expect_success $pr 'notes work' "test_notes $count"
  
- 	test_expect_success 'notes work' "test_notes $count"
+ 	test_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' "time_notes 100"
+ 
+ 	test_expect_success $pr 'teardown / cd ..' 'cd ..'
+ }
  
- 	test_expect_success 'notes timing' "time_notes 100"
- 	)
+ do_tests NOT_EXPENSIVE 10
+ for count in 100 1000 10000; do
+ 	do_tests EXPENSIVE $count
  done
  
  test_done
diff --combined t/t5601-clone.sh
index 4431dfd02b,8617965ec0..987e0c8463
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@@ -163,8 -163,6 +163,6 @@@ test_expect_success 'clone a void' 
  
  test_expect_success 'clone respects global branch.autosetuprebase' '
  	(
- 		HOME=$(pwd) &&
- 		export HOME &&
  		test_config="$HOME/.gitconfig" &&
  		unset GIT_CONFIG_NOGLOBAL &&
  		git config -f "$test_config" branch.autosetuprebase remote &&
@@@ -178,14 -176,8 +176,14 @@@
  
  test_expect_success 'respect url-encoding of file://' '
  	git init x+y &&
 -	test_must_fail git clone "file://$PWD/x+y" xy-url &&
 -	git clone "file://$PWD/x%2By" xy-url
 +	git clone "file://$PWD/x+y" xy-url-1 &&
 +	git clone "file://$PWD/x%2By" xy-url-2
 +'
 +
 +test_expect_success 'do not query-string-decode + in URLs' '
 +	rm -rf x+y &&
 +	git init "x y" &&
 +	test_must_fail git clone "file://$PWD/x+y" xy-no-plus
  '
  
  test_expect_success 'do not respect url-encoding of non-url path' '
diff --combined t/t6031-merge-recursive.sh
index bd75e0e643,66167e3f73..1cd649e245
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@@ -2,11 -2,7 +2,7 @@@
  
  test_description='merge-recursive: handle file mode'
  . ./test-lib.sh
- 
- if ! test "$(git config --bool core.filemode)" = false
- then
- 	test_set_prereq FILEMODE
- fi
+ . "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
  
  test_expect_success 'mode change in one branch: keep changed version' '
  	: >file1 &&
@@@ -57,35 -53,4 +53,35 @@@ test_expect_success FILEMODE 'verify ex
  	test -x file2
  '
  
 +test_expect_success 'merging with triple rename across D/F conflict' '
 +	git reset --hard HEAD &&
 +	git checkout -b main &&
 +	git rm -rf . &&
 +
 +	echo "just a file" >sub1 &&
 +	mkdir -p sub2 &&
 +	echo content1 >sub2/file1 &&
 +	echo content2 >sub2/file2 &&
 +	echo content3 >sub2/file3 &&
 +	mkdir simple &&
 +	echo base >simple/bar &&
 +	git add -A &&
 +	test_tick &&
 +	git commit -m base &&
 +
 +	git checkout -b other &&
 +	echo more >>simple/bar &&
 +	test_tick &&
 +	git commit -a -m changesimplefile &&
 +
 +	git checkout main &&
 +	git rm sub1 &&
 +	git mv sub2 sub1 &&
 +	test_tick &&
 +	git commit -m changefiletodir &&
 +
 +	test_tick &&
 +	git merge other
 +'
 +
  test_done
diff --combined t/t6035-merge-dir-to-symlink.sh
index dc09513be5,28e8f2ae61..92e02d5d77
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@@ -3,13 -3,7 +3,7 @@@
  test_description='merging when a directory was replaced with a symlink'
  . ./test-lib.sh
  
- if ! test_have_prereq SYMLINKS
- then
- 	skip_all='Symbolic links not supported, skipping tests.'
- 	test_done
- fi
- 
- test_expect_success 'create a commit where dir a/b changed to symlink' '
+ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' '
  	mkdir -p a/b/c a/b-2/c &&
  	> a/b/c/d &&
  	> a/b-2/c/d &&
@@@ -23,7 -17,7 +17,7 @@@
  	git commit -m "dir to symlink"
  '
  
- test_expect_success 'keep a/b-2/c/d across checkout' '
+ test_expect_success SYMLINKS 'keep a/b-2/c/d across checkout' '
  	git checkout HEAD^0 &&
  	git reset --hard master &&
  	git rm --cached a/b &&
@@@ -32,14 -26,14 +26,14 @@@
  	 test -f a/b-2/c/d
  '
  
- test_expect_success 'checkout should not have deleted a/b-2/c/d' '
+ test_expect_success SYMLINKS 'checkout should not have deleted a/b-2/c/d' '
  	git checkout HEAD^0 &&
  	git reset --hard master &&
  	 git checkout start^0 &&
  	 test -f a/b-2/c/d
  '
  
- test_expect_success 'setup for merge test' '
+ test_expect_success SYMLINKS 'setup for merge test' '
  	git reset --hard &&
  	test -f a/b-2/c/d &&
  	echo x > a/x &&
@@@ -48,7 -42,7 +42,7 @@@
  	git tag baseline
  '
  
- test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
 -test_expect_success SYMLINKS 'do not lose a/b-2/c/d in merge (resolve)' '
++test_expect_success SYMLINKS 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s resolve master &&
@@@ -56,7 -50,7 +50,7 @@@
  	test -f a/b-2/c/d
  '
  
- test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
 -test_expect_failure 'do not lose a/b-2/c/d in merge (recursive)' '
++test_expect_success SYMLINKS 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s recursive master &&
@@@ -64,55 -58,7 +58,55 @@@
  	test -f a/b-2/c/d
  '
  
- test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
++test_expect_success SYMLINKS 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
 +	git reset --hard &&
 +	git checkout master^0 &&
 +	git merge -s resolve baseline^0 &&
 +	test -h a/b &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
++test_expect_success SYMLINKS 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
 +	git reset --hard &&
 +	git checkout master^0 &&
 +	git merge -s recursive baseline^0 &&
 +	test -h a/b &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_failure 'do not lose untracked in merge (resolve)' '
++test_expect_failure SYMLINKS 'do not lose untracked in merge (resolve)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	>a/b/c/e &&
 +	test_must_fail git merge -s resolve master &&
 +	test -f a/b/c/e &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_success 'do not lose untracked in merge (recursive)' '
++test_expect_success SYMLINKS 'do not lose untracked in merge (recursive)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	>a/b/c/e &&
 +	test_must_fail git merge -s recursive master &&
 +	test -f a/b/c/e &&
 +	test -f a/b-2/c/d
 +'
 +
- test_expect_success 'do not lose modifications in merge (resolve)' '
++test_expect_success SYMLINKS 'do not lose modifications in merge (resolve)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	echo more content >>a/b/c/d &&
 +	test_must_fail git merge -s resolve master
 +'
 +
- test_expect_success 'do not lose modifications in merge (recursive)' '
++test_expect_success SYMLINKS 'do not lose modifications in merge (recursive)' '
 +	git reset --hard &&
 +	git checkout baseline^0 &&
 +	echo more content >>a/b/c/d &&
 +	test_must_fail git merge -s recursive master
 +'
 +
- test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
+ test_expect_success SYMLINKS 'setup a merge where dir a/b-2 changed to symlink' '
  	git reset --hard &&
  	git checkout start^0 &&
  	rm -rf a/b-2 &&
@@@ -122,7 -68,7 +116,7 @@@
  	git tag test2
  '
  
- test_expect_success 'merge should not have D/F conflicts (resolve)' '
 -test_expect_success SYMLINKS 'merge should not have conflicts (resolve)' '
++test_expect_success SYMLINKS 'merge should not have D/F conflicts (resolve)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s resolve test2 &&
@@@ -130,7 -76,7 +124,7 @@@
  	test -f a/b/c/d
  '
  
- test_expect_success 'merge should not have D/F conflicts (recursive)' '
 -test_expect_failure 'merge should not have conflicts (recursive)' '
++test_expect_success SYMLINKS 'merge should not have D/F conflicts (recursive)' '
  	git reset --hard &&
  	git checkout baseline^0 &&
  	git merge -s recursive test2 &&
@@@ -138,12 -84,4 +132,12 @@@
  	test -f a/b/c/d
  '
  
- test_expect_success 'merge should not have F/D conflicts (recursive)' '
++test_expect_success SYMLINKS 'merge should not have F/D conflicts (recursive)' '
 +	git reset --hard &&
 +	git checkout -b foo test2 &&
 +	git merge -s recursive baseline^0 &&
 +	test -h a/b-2 &&
 +	test -f a/b/c/d
 +'
 +
  test_done
diff --combined t/t7300-clean.sh
index 3a43571cab,fe8abf6fd9..7dbbea13ac
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@@ -388,16 -388,15 +388,15 @@@ test_expect_success 'core.excludesfile
  
  '
  
- test_expect_success 'removal failure' '
+ test_expect_success SANITY 'removal failure' '
  
  	mkdir foo &&
  	touch foo/bar &&
  	(exec <foo/bar &&
  	 chmod 0 foo &&
- 	 test_must_fail git clean -f -d)
- 
+ 	 test_must_fail git clean -f -d &&
+ 	 chmod 755 foo)
  '
- chmod 755 foo
  
  test_expect_success 'nested git work tree' '
  	rm -fr foo bar &&
@@@ -438,20 -437,4 +437,20 @@@ test_expect_success 'force removal of n
  	! test -d bar
  '
  
 +test_expect_success 'git clean -e' '
 +	rm -fr repo &&
 +	mkdir repo &&
 +	(
 +		cd repo &&
 +		git init &&
 +		touch 1 2 3 known &&
 +		git add known &&
 +		git clean -f -e 1 -e 2 &&
 +		test -e 1 &&
 +		test -e 2 &&
 +		! (test -e 3) &&
 +		test -e known
 +	)
 +'
 +
  test_done
diff --combined t/t7508-status.sh
index 9c14b853c0,ee0e57352d..18b07d9d36
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@@ -793,7 -793,7 +793,7 @@@ test_expect_success 'commit --dry-run s
  	test_cmp expect output
  '
  
- test_expect_success POSIXPERM 'status succeeds in a read-only repository' '
+ test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
  	(
  		chmod a-w .git &&
  		# make dir1/tracked stat-dirty
@@@ -808,38 -808,24 +808,38 @@@
  	(exit $status)
  '
  
 +(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar' && cd .. && git add sm)
 +new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 +touch .gitmodules
 +
  cat > expect << EOF
  # On branch master
 +# Changes to be committed:
 +#   (use "git reset HEAD <file>..." to unstage)
 +#
 +#	modified:   sm
 +#
  # Changed but not updated:
  #   (use "git add <file>..." to update what will be committed)
  #   (use "git checkout -- <file>..." to discard changes in working directory)
  #
  #	modified:   dir1/modified
  #
 +# Submodule changes to be committed:
 +#
 +# * sm $head...$new_head (1):
 +#   > Add bar
 +#
  # Untracked files:
  #   (use "git add <file>..." to include in what will be committed)
  #
 +#	.gitmodules
  #	dir1/untracked
  #	dir2/modified
  #	dir2/untracked
  #	expect
  #	output
  #	untracked
 -no changes added to commit (use "git add" and/or "git commit -a")
  EOF
  
  test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
@@@ -848,89 -834,19 +848,89 @@@
  	test_cmp expect output
  '
  
 +test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
 +	git config diff.ignoreSubmodules dirty &&
 +	git status >output &&
 +	test_cmp expect output &&
 +	git config --add -f .gitmodules submodule.subname.ignore untracked &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname &&
 +	git config --unset diff.ignoreSubmodules
 +'
 +
 +test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore untracked &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config --remove-section -f .gitmodules submodule.subname
 +'
 +
  test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
  	git status --ignore-submodules=dirty > output &&
  	test_cmp expect output
  '
  
 +test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
 +	git config diff.ignoreSubmodules dirty &&
 +	git status >output &&
 +	! test -s actual &&
 +	git config --add -f .gitmodules submodule.subname.ignore dirty &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname &&
 +	git config --unset diff.ignoreSubmodules
 +'
 +
 +test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore dirty &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
  test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
  	echo modified > sm/foo &&
  	git status --ignore-submodules=dirty > output &&
  	test_cmp expect output
  '
  
 +test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
 +	git config --add -f .gitmodules submodule.subname.ignore dirty &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
 +test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore dirty &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
  cat > expect << EOF
  # On branch master
 +# Changes to be committed:
 +#   (use "git reset HEAD <file>..." to unstage)
 +#
 +#	modified:   sm
 +#
  # Changed but not updated:
  #   (use "git add <file>..." to update what will be committed)
  #   (use "git checkout -- <file>..." to discard changes in working directory)
@@@ -939,21 -855,16 +939,21 @@@
  #	modified:   dir1/modified
  #	modified:   sm (modified content)
  #
 +# Submodule changes to be committed:
 +#
 +# * sm $head...$new_head (1):
 +#   > Add bar
 +#
  # Untracked files:
  #   (use "git add <file>..." to include in what will be committed)
  #
 +#	.gitmodules
  #	dir1/untracked
  #	dir2/modified
  #	dir2/untracked
  #	expect
  #	output
  #	untracked
 -no changes added to commit (use "git add" and/or "git commit -a")
  EOF
  
  test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
@@@ -961,34 -872,10 +961,34 @@@
  	test_cmp expect output
  '
  
 +test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
 +	git config --add -f .gitmodules submodule.subname.ignore untracked &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
 +test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore untracked &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
  head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
  
  cat > expect << EOF
  # On branch master
 +# Changes to be committed:
 +#   (use "git reset HEAD <file>..." to unstage)
 +#
 +#	modified:   sm
 +#
  # Changed but not updated:
  #   (use "git add <file>..." to update what will be committed)
  #   (use "git checkout -- <file>..." to discard changes in working directory)
@@@ -996,26 -883,21 +996,26 @@@
  #	modified:   dir1/modified
  #	modified:   sm (new commits)
  #
 +# Submodule changes to be committed:
 +#
 +# * sm $head...$new_head (1):
 +#   > Add bar
 +#
  # Submodules changed but not updated:
  #
 -# * sm $head...$head2 (1):
 +# * sm $new_head...$head2 (1):
  #   > 2nd commit
  #
  # Untracked files:
  #   (use "git add <file>..." to include in what will be committed)
  #
 +#	.gitmodules
  #	dir1/untracked
  #	dir2/modified
  #	dir2/untracked
  #	expect
  #	output
  #	untracked
 -no changes added to commit (use "git add" and/or "git commit -a")
  EOF
  
  test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
@@@ -1023,47 -905,10 +1023,47 @@@
  	test_cmp expect output
  '
  
 +test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
 +	git config --add -f .gitmodules submodule.subname.ignore untracked &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
 +test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore untracked &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
  test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
  	git status --ignore-submodules=dirty > output &&
  	test_cmp expect output
  '
 +test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
 +	git config --add -f .gitmodules submodule.subname.ignore dirty &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
 +test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore dirty &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
  
  cat > expect << EOF
  # On branch master
@@@ -1076,7 -921,6 +1076,7 @@@
  # Untracked files:
  #   (use "git add <file>..." to include in what will be committed)
  #
 +#	.gitmodules
  #	dir1/untracked
  #	dir2/modified
  #	dir2/untracked
@@@ -1091,23 -935,4 +1091,23 @@@ test_expect_success "--ignore-submodule
  	test_cmp expect output
  '
  
 +test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
 +	git config --add -f .gitmodules submodule.subname.ignore all &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
 +test_expect_failure '.git/config ignore=all suppresses submodule summary' '
 +	git config --add -f .gitmodules submodule.subname.ignore none &&
 +	git config --add -f .gitmodules submodule.subname.path sm &&
 +	git config --add submodule.subname.ignore all &&
 +	git config --add submodule.subname.path sm &&
 +	git status > output &&
 +	test_cmp expect output &&
 +	git config --remove-section submodule.subname &&
 +	git config -f .gitmodules  --remove-section submodule.subname
 +'
 +
  test_done
diff --combined t/t9130-git-svn-authors-file.sh
index 3c4f31925f,d5ee39ae9e..ec0a106614
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@@ -20,7 -20,7 +20,7 @@@ test_expect_success 'setup svnrepo' 
  	'
  
  test_expect_success 'start import with incomplete authors file' '
 -	! git svn clone --authors-file=svn-authors "$svnrepo" x
 +	test_must_fail git svn clone --authors-file=svn-authors "$svnrepo" x
  	'
  
  test_expect_success 'imported 2 revisions successfully' '
@@@ -63,7 -63,7 +63,7 @@@ test_expect_success 'authors-file again
  	'
  
  test_expect_success 'fetch fails on ee' '
 -	( cd aa-work && ! git svn fetch --authors-file=../svn-authors )
 +	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
  	'
  
  tmp_config_get () {
@@@ -95,8 -95,6 +95,6 @@@ test_expect_success 'fresh clone with s
  	(
  		rm -r "$GIT_DIR" &&
  		test x = x"$(git config svn.authorsfile)" &&
- 		HOME="`pwd`" &&
- 		export HOME &&
  		test_config="$HOME"/.gitconfig &&
  		unset GIT_CONFIG_NOGLOBAL &&
  		unset GIT_DIR &&
diff --combined t/test-lib.sh
index 3a3d4c4723,67553f3dfc..dff5e25ae6
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -256,10 -256,6 +256,10 @@@ q_to_cr () 
  	tr Q '\015'
  }
  
 +q_to_tab () {
 +	tr Q '\011'
 +}
 +
  append_cr () {
  	sed -e 's/$/Q/' | tr Q '\015'
  }
@@@ -331,12 -327,35 +331,35 @@@ test_set_prereq () 
  satisfied=" "
  
  test_have_prereq () {
- 	case $satisfied in
- 	*" $1 "*)
- 		: yes, have it ;;
- 	*)
- 		! : nope ;;
- 	esac
+ 	# prerequisites can be concatenated with ','
+ 	save_IFS=$IFS
+ 	IFS=,
+ 	set -- $*
+ 	IFS=$save_IFS
+ 
+ 	total_prereq=0
+ 	ok_prereq=0
+ 	missing_prereq=
+ 
+ 	for prerequisite
+ 	do
+ 		total_prereq=$(($total_prereq + 1))
+ 		case $satisfied in
+ 		*" $prerequisite "*)
+ 			ok_prereq=$(($ok_prereq + 1))
+ 			;;
+ 		*)
+ 			# Keep a list of missing prerequisites
+ 			if test -z "$missing_prereq"
+ 			then
+ 				missing_prereq=$prerequisite
+ 			else
+ 				missing_prereq="$prerequisite,$missing_prereq"
+ 			fi
+ 		esac
+ 	done
+ 
+ 	test $total_prereq = $ok_prereq
  }
  
  # You are not expected to call test_ok_ and test_failure_ directly, use
@@@ -398,8 -417,14 +421,14 @@@ test_skip () 
  	fi
  	case "$to_skip" in
  	t)
+ 		of_prereq=
+ 		if test "$missing_prereq" != "$prereq"
+ 		then
+ 			of_prereq=" of $prereq"
+ 		fi
+ 
  		say_color skip >&3 "skipping test: $@"
- 		say_color skip "ok $test_count # skip $1"
+ 		say_color skip "ok $test_count # skip $1 (missing $missing_prereq${of_prereq})"
  		: true
  		;;
  	*)
@@@ -545,38 -570,6 +574,38 @@@ test_external_without_stderr () 
  	fi
  }
  
 +# debugging-friendly alternatives to "test [-f|-d|-e]"
 +# The commands test the existence or non-existence of $1. $2 can be
 +# given to provide a more precise diagnosis.
 +test_path_is_file () {
 +	if ! [ -f "$1" ]
 +	then
 +		echo "File $1 doesn't exist. $*"
 +		false
 +	fi
 +}
 +
 +test_path_is_dir () {
 +	if ! [ -d "$1" ]
 +	then
 +		echo "Directory $1 doesn't exist. $*"
 +		false
 +	fi
 +}
 +
 +test_path_is_missing () {
 +	if [ -e "$1" ]
 +	then
 +		echo "Path exists:"
 +		ls -ld "$1"
 +		if [ $# -ge 1 ]; then
 +			echo "$*"
 +		fi
 +		false
 +	fi
 +}
 +
 +
  # This is not among top-level (test_expect_success | test_expect_failure)
  # but is a prefix that can be used in the test script, like:
  #
@@@ -657,28 -650,31 +686,31 @@@ test_when_finished () 
  test_create_repo () {
  	test "$#" = 1 ||
  	error "bug in the test script: not 1 parameter to test-create-repo"
- 	owd=`pwd`
  	repo="$1"
  	mkdir -p "$repo"
- 	cd "$repo" || error "Cannot setup test environment"
- 	"$GIT_EXEC_PATH/git-init" "--template=$TEST_DIRECTORY/../templates/blt/" >&3 2>&4 ||
- 	error "cannot run git init -- have you built things yet?"
- 	mv .git/hooks .git/hooks-disabled
- 	cd "$owd"
+ 	(
+ 		cd "$repo" || error "Cannot setup test environment"
+ 		"$GIT_EXEC_PATH/git-init" "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
+ 		error "cannot run git init -- have you built things yet?"
+ 		mv .git/hooks .git/hooks-disabled
+ 	) || exit
  }
  
  test_done () {
  	GIT_EXIT_OK=t
- 	test_results_dir="$TEST_DIRECTORY/test-results"
- 	mkdir -p "$test_results_dir"
- 	test_results_path="$test_results_dir/${0%.sh}-$$.counts"
  
- 	echo "total $test_count" >> $test_results_path
- 	echo "success $test_success" >> $test_results_path
- 	echo "fixed $test_fixed" >> $test_results_path
- 	echo "broken $test_broken" >> $test_results_path
- 	echo "failed $test_failure" >> $test_results_path
- 	echo "" >> $test_results_path
+ 	if test -z "$HARNESS_ACTIVE"; then
+ 		test_results_dir="$TEST_DIRECTORY/test-results"
+ 		mkdir -p "$test_results_dir"
+ 		test_results_path="$test_results_dir/${0%.sh}-$$.counts"
+ 
+ 		echo "total $test_count" >> $test_results_path
+ 		echo "success $test_success" >> $test_results_path
+ 		echo "fixed $test_fixed" >> $test_results_path
+ 		echo "broken $test_broken" >> $test_results_path
+ 		echo "failed $test_failure" >> $test_results_path
+ 		echo "" >> $test_results_path
+ 	fi
  
  	if test "$test_fixed" != 0
  	then
@@@ -720,7 -716,15 +752,15 @@@
  
  # Test the binaries we have just built.  The tests are kept in
  # t/ subdirectory and are run in 'trash directory' subdirectory.
- TEST_DIRECTORY=$(pwd)
+ if test -z "$TEST_DIRECTORY"
+ then
+ 	# We allow tests to override this, in case they want to run tests
+ 	# outside of t/, e.g. for running tests on the test library
+ 	# itself.
+ 	TEST_DIRECTORY=$(pwd)
+ fi
+ GIT_BUILD_DIR="$TEST_DIRECTORY"/..
+ 
  if test -n "$valgrind"
  then
  	make_symlink () {
@@@ -747,7 -751,7 +787,7 @@@
  		test -x "$1" || return
  
  		base=$(basename "$1")
- 		symlink_target=$TEST_DIRECTORY/../$base
+ 		symlink_target=$GIT_BUILD_DIR/$base
  		# do not override scripts
  		if test -x "$symlink_target" &&
  		    test ! -d "$symlink_target" &&
@@@ -766,7 -770,7 +806,7 @@@
  	# override all git executables in TEST_DIRECTORY/..
  	GIT_VALGRIND=$TEST_DIRECTORY/valgrind
  	mkdir -p "$GIT_VALGRIND"/bin
- 	for file in $TEST_DIRECTORY/../git* $TEST_DIRECTORY/../test-*
+ 	for file in $GIT_BUILD_DIR/git* $GIT_BUILD_DIR/test-*
  	do
  		make_valgrind_symlink $file
  	done
@@@ -787,10 -791,10 +827,10 @@@
  elif test -n "$GIT_TEST_INSTALLED" ; then
  	GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path)  ||
  	error "Cannot run git from $GIT_TEST_INSTALLED."
- 	PATH=$GIT_TEST_INSTALLED:$TEST_DIRECTORY/..:$PATH
+ 	PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
  	GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
  else # normal case, use ../bin-wrappers only unless $with_dashes:
- 	git_bin_dir="$TEST_DIRECTORY/../bin-wrappers"
+ 	git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
  	if ! test -x "$git_bin_dir/git" ; then
  		if test -z "$with_dashes" ; then
  			say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH"
@@@ -798,18 -802,18 +838,18 @@@
  		with_dashes=t
  	fi
  	PATH="$git_bin_dir:$PATH"
- 	GIT_EXEC_PATH=$TEST_DIRECTORY/..
+ 	GIT_EXEC_PATH=$GIT_BUILD_DIR
  	if test -n "$with_dashes" ; then
- 		PATH="$TEST_DIRECTORY/..:$PATH"
+ 		PATH="$GIT_BUILD_DIR:$PATH"
  	fi
  fi
- GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
+ GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt
  unset GIT_CONFIG
  GIT_CONFIG_NOSYSTEM=1
  GIT_CONFIG_NOGLOBAL=1
  export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL
  
- . ../GIT-BUILD-OPTIONS
+ . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
  
  if test -z "$GIT_TEST_CMP"
  then
@@@ -821,22 -825,22 +861,22 @@@
  	fi
  fi
  
- GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
+ GITPERLLIB="$GIT_BUILD_DIR"/perl/blib/lib:"$GIT_BUILD_DIR"/perl/blib/arch/auto/Git
  export GITPERLLIB
- test -d ../templates/blt || {
+ test -d "$GIT_BUILD_DIR"/templates/blt || {
  	error "You haven't built things yet, have you?"
  }
  
  if test -z "$GIT_TEST_INSTALLED" && test -z "$NO_PYTHON"
  then
- 	GITPYTHONLIB="$(pwd)/../git_remote_helpers/build/lib"
+ 	GITPYTHONLIB="$GIT_BUILD_DIR/git_remote_helpers/build/lib"
  	export GITPYTHONLIB
- 	test -d ../git_remote_helpers/build || {
+ 	test -d "$GIT_BUILD_DIR"/git_remote_helpers/build || {
  		error "You haven't built git_remote_helpers yet, have you?"
  	}
  fi
  
- if ! test -x ../test-chmtime; then
+ if ! test -x "$GIT_BUILD_DIR"/test-chmtime; then
  	echo >&2 'You need to build test-chmtime:'
  	echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
  	exit 1
@@@ -861,6 -865,9 +901,9 @@@ test_create_repo "$test
  # in subprocesses like git equals our $PWD (for pathname comparisons).
  cd -P "$test" || exit 1
  
+ HOME=$(pwd)
+ export HOME
+ 
  this_test=${0##*/}
  this_test=${this_test%%-*}
  for skp in $GIT_SKIP_TESTS
@@@ -922,3 -929,7 +965,7 @@@ test -z "$NO_PYTHON" && test_set_prere
  # test whether the filesystem supports symbolic links
  ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
  rm -f y
+ 
+ # When the tests are run as root, permission tests will report that
+ # things are writable when they shouldn't be.
+ test -w / || test_set_prereq SANITY