From 776566000ffed2ffed5783f2227bb36859c85005 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 7 Jul 2005 11:39:10 -0700 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- t/README | 8 ++++++++ t/{t6000-lib.sh => t6000lib.sh} | 0 t/t6001-rev-list-merge-order.sh | 2 +- t/t6002-rev-list-bisect.sh | 2 +- t/t6003-rev-list-topo-order.sh | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) rename t/{t6000-lib.sh => t6000lib.sh} (100%) diff --git a/t/README b/t/README index 2a94fdb0..ab47ef9c 100644 --- a/t/README +++ b/t/README @@ -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 similarity index 100% rename from t/t6000-lib.sh rename to t/t6000lib.sh diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh index 66bd9ca8..5dcb957a 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 a5e313b2..6a718208 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 98c5e2fa..eb41f86a 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() { -- 2.11.0