Browse Source

[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>
maint
Junio C Hamano 20 years ago committed by Linus Torvalds
parent
commit
776566000f
  1. 8
      t/README
  2. 0
      t/t6000lib.sh
  3. 2
      t/t6001-rev-list-merge-order.sh
  4. 2
      t/t6002-rev-list-bisect.sh
  5. 2
      t/t6003-rev-list-topo-order.sh

8
t/README

@ -79,6 +79,14 @@ Second digit tells the particular command we are testing. @@ -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
-------------

0
t/t6000-lib.sh → t/t6000lib.sh

2
t/t6001-rev-list-merge-order.sh

@ -6,7 +6,7 @@ @@ -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()

2
t/t6002-rev-list-bisect.sh

@ -5,7 +5,7 @@ @@ -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()
{

2
t/t6003-rev-list-topo-order.sh

@ -6,7 +6,7 @@ @@ -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()
{

Loading…
Cancel
Save