diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-07 11:39:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 15:53:35 -0700 |
| commit | 776566000ffed2ffed5783f2227bb36859c85005 (patch) | |
| tree | e6f357742c9eaebbd8421c2169474a43151e06c5 | |
| parent | e95ab1edf38a0747832330cfa66763c25af9ad62 (diff) | |
| download | git-776566000ffed2ffed5783f2227bb36859c85005.tar.gz git-776566000ffed2ffed5783f2227bb36859c85005.tar.xz | |
[PATCH] Prevent t6000 series from dropping useless sed.script in t/
The Makefile in the test suite directory considers any file
matching t[0-9][0-9][0-9][0-9]-*.sh as the top-level test script
to be executed. Unfortunately this was not documented, and the
common test library, t6000-lib.sh was named to match that
pattern. This caused t6000-lib.sh to be called from Makefile as
the top-level program, causing it to leave t/sed.script file
behind. Rename it to t6000lib.sh to prevent this, and document
the naming convention a bit more clearly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | t/README | 8 | ||||
| -rw-r--r-- | t/t6000lib.sh (renamed from t/t6000-lib.sh) | 0 | ||||
| -rwxr-xr-x | t/t6001-rev-list-merge-order.sh | 2 | ||||
| -rwxr-xr-x | t/t6002-rev-list-bisect.sh | 2 | ||||
| -rwxr-xr-x | t/t6003-rev-list-topo-order.sh | 2 |
5 files changed, 11 insertions, 3 deletions
@@ -79,6 +79,14 @@ 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 ------------- diff --git a/t/t6000-lib.sh b/t/t6000lib.sh index 01f796e9c..01f796e9c 100644 --- a/t/t6000-lib.sh +++ b/t/t6000lib.sh diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 66bd9ca8d..5dcb957ac 100755 --- a/t/t6001-rev-list-merge-order.sh +++ b/t/t6001-rev-list-merge-order.sh @@ -6,7 +6,7 @@ test_description='Tests git-rev-list --merge-order functionality' . ./test-lib.sh -. ../t6000-lib.sh # t6xxx specific functions +. ../t6000lib.sh # t6xxx specific functions # test-case specific test function check_adjacency() diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh index a5e313b2f..6a7182082 100755 --- a/t/t6002-rev-list-bisect.sh +++ b/t/t6002-rev-list-bisect.sh @@ -5,7 +5,7 @@ test_description='Tests git-rev-list --bisect functionality' . ./test-lib.sh -. ../t6000-lib.sh +. ../t6000lib.sh # t6xxx specific functions bc_expr() { diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh index 98c5e2fae..eb41f86a1 100755 --- a/t/t6003-rev-list-topo-order.sh +++ b/t/t6003-rev-list-topo-order.sh @@ -6,7 +6,7 @@ test_description='Tests git-rev-list --topo-order functionality' . ./test-lib.sh -. ../t6000-lib.sh # t6xxx specific functions +. ../t6000lib.sh # t6xxx specific functions list_duplicates() { |