1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
git/t
Shawn O. Pearce aac65ed1bc Fix possible coredump with fast-import --import-marks
When e8438420bb allowed us to reload
the marks table on subsequent runs of fast-import we really broke
things, as we set pack_id to MAX_PACK_ID for any objects we imported
into the marks table.  Creating a branch from that mark should fail
as we attempt to read the object through a non-existant packed_git
pointer.  Instead we have to use the normal Git object system to
locate the older commit, as we ourselves do not have a reference
to the packed_git it resides in.

This bug only occurred because t9300 was not complete enough.
When we added the --import-marks feature we didn't actually test
its implementation enough to verify the function worked as intended.
I have corrected that, and included the changes as part of this fix.
Prior versions of fast-import fail the new test(s); this commit
allows them to pass.

Credit for this bug find goes to Simon Hausmann <simon@lst.de> as
he recently identified a similiar bug in the tree lazy-loading path.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-05-24 00:50:19 -04:00
..
t3900 Rename t3900 test vector file 2006-12-27 17:38:02 -08:00
t4013 Add testcase for format-patch --subject-prefix (take 3) 2007-04-11 18:48:40 -07:00
t4100
t4101
t5100 git-mailinfo fixes for patch munging 2007-03-31 00:59:19 -07:00
t5515 t/t5515-fetch-merge-logic.sh: Add two more tests 2007-03-07 10:22:44 -08:00
t9110 git-svn: fix useSvmProps, hopefully for the last time 2007-02-23 00:57:13 -08:00
t9111 git-svn: add test for useSvnsyncProps 2007-02-23 00:57:13 -08:00
.gitignore
annotate-tests.sh make t8001 work on Mac OS X again 2007-03-06 17:09:53 -08:00
diff-lib.sh Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
lib-git-svn.sh Update tests to use test-chmtime 2007-02-25 11:09:56 -08:00
lib-read-tree-m-3way.sh Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
Makefile git-svn: remove non-delta fetch code paths 2006-12-28 01:39:09 -08:00
README use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t0000-basic.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t0010-racy-git.sh
t0020-crlf.sh Update 'crlf' attribute semantics. 2007-04-19 22:37:44 -07:00
t0021-conversion.sh Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs 2007-05-14 19:03:32 -07:00
t1000-read-tree-m-3way.sh t1000: fix case table. 2007-04-10 12:55:51 -07:00
t1001-read-tree-m-2way.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t1002-read-tree-m-u-2way.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t1003-read-tree-prefix.sh Add a couple of subdirectory tests. 2006-08-03 14:41:29 -07:00
t1004-read-tree-m-u-wf.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t1020-subdirectory.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t1100-commit-tree-options.sh
t1200-tutorial.sh Remove git-resolve. 2007-02-12 19:33:03 -08:00
t1300-repo-config.sh t1300: Add tests for git-config --bool --get 2007-05-20 16:00:22 -07:00
t1400-update-ref.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t1410-reflog.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
t2000-checkout-cache-clash.sh
t2001-checkout-cache-clash.sh
t2002-checkout-cache-u.sh
t2003-checkout-cache-mkdir.sh
t2004-checkout-cache-temp.sh
t2005-checkout-index-symlinks.sh Add core.symlinks to mark filesystems that do not support symbolic links. 2007-03-02 16:58:05 -08:00
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh
t2102-update-index-symlinks.sh Add core.symlinks to mark filesystems that do not support symbolic links. 2007-03-02 16:58:05 -08:00
t2200-add-update.sh git-add: allow path limiting with -u 2007-05-12 01:01:28 -07:00
t3000-ls-files-others.sh
t3001-ls-files-others-exclude.sh git-status: respect core.excludesFile 2007-05-21 18:36:02 -07:00
t3002-ls-files-dashpath.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t3010-ls-files-killed-modified.sh
t3020-ls-files-error-unmatch.sh
t3030-merge-recursive.sh Remove case-sensitive file in t3030-merge-recursive. 2007-04-19 23:28:15 -07:00
t3040-subprojects-basic.sh Tests for core subproject support 2007-04-18 17:08:42 -07:00
t3100-ls-tree-restrict.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t3101-ls-tree-dirname.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t3200-branch.sh t3200-branch.sh: small language nit 2007-04-06 17:21:11 -07:00
t3210-pack-refs.sh Fix seriously broken "git pack-refs" 2007-01-25 19:16:07 -08:00
t3300-funny-names.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t3400-rebase.sh
t3401-rebase-partial.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t3402-rebase-merge.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t3403-rebase-skip.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t3500-cherry.sh
t3501-revert-cherry-pick.sh Use merge-recursive in git-revert/git-cherry-pick 2007-01-14 22:00:34 -08:00
t3600-rm.sh Add --ignore-unmatch option to exit with zero status when no files are removed. 2007-04-17 00:19:11 -07:00
t3700-add.sh dir.c(common_prefix): Fix two bugs 2007-04-23 01:44:00 -07:00
t3800-mktag.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t3900-i18n-commit.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t3901-8859-1.txt t3901: test "format-patch | am" pipe with i18n 2007-01-13 10:10:20 -08:00
t3901-i18n-patch.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t3901-utf8.txt t3901: test "format-patch | am" pipe with i18n 2007-01-13 10:10:20 -08:00
t4000-diff-format.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t4001-diff-rename.sh
t4002-diff-basic.sh
t4003-diff-rename-1.sh
t4004-diff-rename-symlink.sh
t4005-diff-rename-2.sh
t4006-diff-mode.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4007-rename-3.sh
t4008-diff-break-rewrite.sh
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh
t4011-diff-symlink.sh
t4012-diff-binary.sh
t4013-diff-various.sh Add testcase for format-patch --subject-prefix (take 3) 2007-04-11 18:48:40 -07:00
t4014-format-patch.sh
t4015-diff-whitespace.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4016-diff-quote.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4017-diff-retval.sh Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
t4017-quiet.sh Add tests for --quiet option of diff programs 2007-03-16 02:13:27 -07:00
t4020-diff-external.sh Support 'diff=pgm' attribute 2007-04-22 22:16:14 -07:00
t4100-apply-stat.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4101-apply-nonl.sh
t4102-apply-rename.sh [PATCH] Rename git-repo-config to git-config. 2007-01-28 16:16:53 -08:00
t4103-apply-binary.sh Make apply --binary a no-op. 2006-09-07 02:44:40 -07:00
t4104-apply-boundary.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4112-apply-renames.sh t4112: simplify the test and remove unneeded working tree file. 2006-07-26 11:05:44 -07:00
t4113-apply-ending.sh
t4114-apply-typechange.sh typechange tests for git apply (currently failing) 2006-07-16 22:15:21 -07:00
t4115-apply-symlink.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4116-apply-reverse.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4117-apply-reject.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t4118-apply-empty-context.sh t4118: be nice to non-GNU sed 2007-03-28 14:54:30 -07:00
t4119-apply-config.sh t4119: test autocomputing -p<n> for traditional diff input. 2007-02-21 16:18:45 -08:00
t4120-apply-popt.sh Honor -p<n> when applying git diffs 2007-04-05 15:06:58 -07:00
t4121-apply-diffs.sh Fix overwriting of files when applying contextually independent diffs 2007-04-18 15:33:01 -07:00
t4122-apply-symlink-inside.sh read-tree -m -u: avoid getting confused by intermediate symlinks. 2007-05-11 22:33:31 -07:00
t4200-rerere.sh posix compatibility for t4200 2007-05-03 22:58:01 -07:00
t4201-shortlog.sh t4201: Do not display weird characters on the terminal 2007-04-23 21:45:22 -07:00
t5000-tar-tree.sh git-archive: make tar the default format 2007-04-09 18:51:40 -07:00
t5100-mailinfo.sh Add a couple more test cases to the suite. 2007-03-12 23:33:41 -07:00
t5300-pack-object.sh Update tests not to assume that generated packfiles are writable. 2007-04-22 18:59:34 -07:00
t5301-sliding-window.sh use test-genrandom in tests instead of /dev/urandom 2007-04-11 19:31:24 -07:00
t5302-pack-index.sh Don't use seq in tests, not everyone has it 2007-05-02 13:24:23 -04:00
t5400-send-pack.sh Merge branch 'js/diff-ni' 2007-03-10 23:26:33 -08:00
t5401-update-hooks.sh Change {pre,post}-receive hooks to use stdin 2007-03-11 22:56:03 -07:00
t5500-fetch-pack.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
t5502-quickfetch.sh Make sure quickfetch is not fooled with a previous, incomplete fetch. 2007-04-17 00:14:59 -07:00
t5510-fetch.sh Fix t5510-fetch's use of sed 2007-03-12 17:37:30 -07:00
t5515-fetch-merge-logic.sh Merge branch 'js/diff-ni' 2007-03-10 23:26:33 -08:00
t5520-pull.sh git-fetch, git-branch: Support local --track via a special remote '.' 2007-03-16 02:10:12 -07:00
t5600-clone-fail-cleanup.sh Assorted typo fixes 2007-02-03 21:49:54 -08:00
t5700-clone-reference.sh git-clone --reference: saner handling of borrowed symrefs. 2007-02-04 03:28:15 -08:00
t5710-info-alternate.sh git-fsck-objects is now synonym to git-fsck 2007-01-28 16:33:58 -08:00
t6000lib.sh
t6001-rev-list-graft.sh An illustration of rev-list --parents --pretty=raw 2006-09-27 12:34:37 -07:00
t6002-rev-list-bisect.sh t6002: minor spelling fix. 2007-03-22 01:00:12 -07:00
t6003-rev-list-topo-order.sh
t6004-rev-list-path-optim.sh t6004: add a bit more path optimization test. 2007-03-23 02:32:26 -07:00
t6005-rev-list-count.sh revision: --skip=<n> 2006-12-20 11:26:11 -08:00
t6006-rev-list-format.sh t/t6006: add tests for a slightly more complex commit messages 2007-03-28 14:28:00 -07:00
t6010-merge-base.sh
t6020-merge-df.sh
t6021-merge-criss-cross.sh tests: merge-recursive is usable without Python 2006-10-27 14:29:55 -07:00
t6022-merge-rename.sh Add a test for merging changed and rename-changed branches 2007-04-25 23:43:16 -07:00
t6023-merge-file.sh Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
t6023-merge-rename-nocruft.sh Keep untracked files not involved in a merge. 2007-02-03 22:04:28 -08:00
t6024-recursive-merge.sh Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
t6025-merge-symlinks.sh Fix permissions on test scripts 2007-04-16 16:53:09 -07:00
t6026-merge-attr.sh Custom low-level merge driver: change the configuration scheme. 2007-04-18 12:30:26 -07:00
t6030-bisect-porcelain.sh t6030: grab commit object name as we go 2007-04-23 22:11:20 -07:00
t6101-rev-parse-parents.sh
t6120-describe.sh Add describe test. 2007-01-14 21:17:27 -08:00
t6200-fmt-merge-msg.sh Get rid of the dependency to GNU diff in the tests 2007-03-04 00:24:15 -08:00
t7001-mv.sh use 'init' instead of 'init-db' for shipped docs and tools 2007-01-12 13:36:16 -08:00
t7002-grep.sh git-grep: show pathnames relative to the current directory 2006-08-11 19:08:10 -07:00
t7101-reset.sh
t7201-co.sh checkout: allow detaching to HEAD even when switching to the tip of a branch 2007-05-12 12:35:54 -07:00
t7300-clean.sh t7300: Basic tests for git-clean 2007-05-07 15:34:55 -07:00
t8001-annotate.sh
t8002-blame.sh
t8003-blame.sh Add test for blame corner cases. 2007-05-05 22:40:39 -07:00
t9001-send-email.sh
t9100-git-svn-basic.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9101-git-svn-props.sh git-svn: add a test for show-ignore 2007-02-23 00:57:08 -08:00
t9102-git-svn-deep-rmdir.sh Start all test scripts with /bin/sh. 2007-01-15 18:57:48 -08:00
t9104-git-svn-follow-parent.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9105-git-svn-commit-diff.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9106-git-svn-commit-diff-clobber.sh Work around Subversion race in git-svn tests. 2007-02-12 22:17:04 -08:00
t9107-git-svn-migrate.sh git-svn: hide the private git-svn 'config' file as '.metadata' 2007-02-23 00:57:13 -08:00
t9108-git-svn-glob.sh git-svn: brown paper bag fixes 2007-02-23 00:57:12 -08:00
t9110-git-svn-use-svm-props.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9111-git-svn-use-svnsync-props.sh git-svn: don't attempt to minimize URLs by default 2007-05-13 12:10:43 -07:00
t9200-git-cvsexportcommit.sh t9200: Work around HFS+ issues. 2007-02-05 13:38:02 -08:00
t9300-fast-import.sh Fix possible coredump with fast-import --import-marks 2007-05-24 00:50:19 -04:00
t9400-git-cvsserver-server.sh t9400: Use the repository config and nothing else. 2007-05-12 10:19:13 -07:00
test-lib.sh Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL 2007-04-29 02:05:06 -07:00
test4012.png
test9200a.png Rework cvsexportcommit to handle binary files for all cases. 2006-11-13 14:27:38 -08:00
test9200b.png Rework cvsexportcommit to handle binary files for all cases. 2006-11-13 14:27:38 -08:00

Core GIT Tests
==============

This directory holds many test scripts for core GIT tools.  The
first part of this short document describes how to run the tests
and read their output.

When fixing the tools or adding enhancements, you are strongly
encouraged to add tests in this directory to cover what you are
trying to fix or enhance.  The later part of this short document
describes how your test scripts should be organized.


Running Tests
-------------

The easiest way to run tests is to say "make".  This runs all
the tests.

    *** t0000-basic.sh ***
    *   ok 1: .git/objects should be empty after git-init in an empty repo.
    *   ok 2: .git/objects should have 256 subdirectories.
    *   ok 3: git-update-index without --add should fail adding.
    ...
    *   ok 23: no diff after checkout and git-update-index --refresh.
    * passed all 23 test(s)
    *** t0100-environment-names.sh ***
    *   ok 1: using old names should issue warnings.
    *   ok 2: using old names but having new names should not issue warnings.
    ...

Or you can run each test individually from command line, like
this:

    $ sh ./t3001-ls-files-killed.sh
    *   ok 1: git-update-index --add to add various paths.
    *   ok 2: git-ls-files -k to show killed files.
    *   ok 3: validate git-ls-files -k output.
    * passed all 3 test(s)

You can pass --verbose (or -v), --debug (or -d), and --immediate
(or -i) command line argument to the test.

--verbose::
	This makes the test more verbose.  Specifically, the
	command being run and their output if any are also
	output.

--debug::
	This may help the person who is developing a new test.
	It causes the command defined with test_debug to run.

--immediate::
	This causes the test to immediately exit upon the first
	failed test.


Naming Tests
------------

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

	0 - the absolute basics and global stuff
	1 - the basic commands concerning database
	2 - the basic commands concerning the working tree
	3 - the other basic commands (e.g. ls-files)
	4 - the diff commands
	5 - the pull and exporting commands
	6 - the revision tree commands (even e.g. merge-base)
	7 - the porcelainish commands concerning the working tree
	8 - the porcelainish commands concerning forensics
	9 - the git tools

Second digit tells the particular command we are testing.

Third digit (optionally) tells the particular switch or group of switches
we are testing.

If you create files under t/ directory (i.e. here) that is not
the top-level test script, never name the file to match the above
pattern.  The Makefile here considers all such files as the
top-level test script and tries to run all of them.  A care is
especially needed if you are creating a common test library
file, similar to test-lib.sh, because such a library file may
not be suitable for standalone execution.


Writing Tests
-------------

The test script is written as a shell script.  It should start
with the standard "#!/bin/sh" with copyright notices, and an
assignment to variable 'test_description', like this:

	#!/bin/sh
	#
	# Copyright (c) 2005 Junio C Hamano
	#

	test_description='xxx test (option --frotz)

	This test registers the following structure in the cache
	and tries to run git-ls-files with option --frotz.'


Source 'test-lib.sh'
--------------------

After assigning test_description, the test script should source
test-lib.sh like this:

	. ./test-lib.sh

This test harness library does the following things:

 - If the script is invoked with command line argument --help
   (or -h), it shows the test_description and exits.

 - Creates an empty test directory with an empty .git/objects
   database and chdir(2) into it.  This directory is 't/trash'
   if you must know, but I do not think you care.

 - Defines standard test helper functions for your scripts to
   use.  These functions are designed to make all scripts behave
   consistently when command line arguments --verbose (or -v),
   --debug (or -d), and --immediate (or -i) is given.


End with test_done
------------------

Your script will be a sequence of tests, using helper functions
from the test harness library.  At the end of the script, call
'test_done'.


Test harness library
--------------------

There are a handful helper functions defined in the test harness
library for your script to use.

 - test_expect_success <message> <script>

   This takes two strings as parameter, and evaluates the
   <script>.  If it yields success, test is considered
   successful.  <message> should state what it is testing.

   Example:

	test_expect_success \
	    'git-write-tree should be able to write an empty tree.' \
	    'tree=$(git-write-tree)'

 - test_expect_failure <message> <script>

   This is the opposite of test_expect_success.  If <script>
   yields success, test is considered a failure.

   Example:

	test_expect_failure \
	    'git-update-index without --add should fail adding.' \
	    'git-update-index should-be-empty'

 - test_debug <script>

   This takes a single argument, <script>, and evaluates it only
   when the test script is started with --debug command line
   argument.  This is primarily meant for use during the
   development of a new test script.

 - test_done

   Your test script must have test_done at the end.  Its purpose
   is to summarize successes and failures in the test script and
   exit with an appropriate error code.


Tips for Writing Tests
----------------------

As with any programming projects, existing programs are the best
source of the information.  However, do _not_ emulate
t0000-basic.sh when writing your tests.  The test is special in
that it tries to validate the very core of GIT.  For example, it
knows that there will be 256 subdirectories under .git/objects/,
and it knows that the object ID of an empty tree is a certain
40-byte string.  This is deliberately done so in t0000-basic.sh
because the things the very basic core test tries to achieve is
to serve as a basis for people who are changing the GIT internal
drastically.  For these people, after making certain changes,
not seeing failures from the basic test _is_ a failure.  And
such drastic changes to the core GIT that even changes these
otherwise supposedly stable object IDs should be accompanied by
an update to t0000-basic.sh.

However, other tests that simply rely on basic parts of the core
GIT working properly should not have that level of intimate
knowledge of the core GIT internals.  If all the test scripts
hardcoded the object IDs like t0000-basic.sh does, that defeats
the purpose of t0000-basic.sh, which is to isolate that level of
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.