mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/test-2'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-09-04 08:15:36 -07:00
parent b480d38dab e4c62e640d
commit a2c6726417
51 changed files with 968 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
t/t3302-notes-index-expensive.sh
View File

@ -7,11 +7,9 @@ test_description='Test commit notes index (expensive!)'
. ./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
@ -102,17 +100,27 @@ time_notes () {
done
}
for count in 10 100 1000 10000; do
do_tests () {
pr=$1
count=$2
mkdir $count
(cd $count;
test_expect_success $pr 'setup / mkdir' '
mkdir $count &&
cd $count
'
test_expect_success "setup $count" "create_repo $count"
test_expect_success $pr "setup $count" "create_repo $count"
test_expect_success 'notes work' "test_notes $count"
test_expect_success $pr 'notes work' "test_notes $count"
test_expect_success 'notes timing' "time_notes 100"
)
test_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' "time_notes 100"
test_expect_success $pr 'teardown / cd ..' 'cd ..'
}
do_tests NOT_EXPENSIVE 10
for count in 100 1000 10000; do
do_tests EXPENSIVE $count
done
test_done