Merge branch 'ab/test-2'
commita2c6726417db22bea7a878aeb88e18bcc95e5c0c
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 15:15:36 +0000 (4 08:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 15:15:36 +0000 (4 08:15 -0700)
treec79a6a559dfd0445a86dcc87df024136ddf02b44
parentb480d38dab815e780234d0887f4185afc3db1b64
parente4c62e640db3f704b4c27435c6b8efdb170988dc
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
.gitignore
Makefile
t/README
t/t3302-notes-index-expensive.sh
t/t5601-clone.sh
t/t6031-merge-recursive.sh
t/t6035-merge-dir-to-symlink.sh
t/t7300-clean.sh
t/t7508-status.sh
t/t9130-git-svn-authors-file.sh
t/test-lib.sh