CI: Enable t1509 on GitHub Actions and Travis
cover CI: Enable t1509 on GitHub Actions and Travis
It's our long desire to enable t1509 in CI system [1]
This is here to enable it.
[1]: https://lore.kernel.org/git/[email protected]/
Đoàn Trần Công Danh (2):
t1509: correct i18n test
CI: enable t1509 in Travis and GitHub Actions
ci/lib.sh | 13 +++++++++++++ ci/run-docker-build.sh | 3 +++ t/t1509-root-work-tree.sh | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-)
Signature · 1 line
2.26.2.672.g232c24e857
PATCH 1/2 t1509: correct i18n test
git-init(1)'s messages is subjected to i18n.
They should be tested by test_i18n* family.
Fix them.
--- t/t1509-root-work-tree.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
t/t1509-root-work-tree.sh +2 -2
@@ -221,7 +221,7 @@ test_expect_success 'setup' ' rm -rf /.git && echo "Initialized empty Git repository in /.git/" > expected && git init > result && - test_cmp expected result + test_i18ncmp expected result ' test_vars 'auto gitdir, root' ".git" "/" ""
@@ -246,7 +246,7 @@ test_expect_success 'setup' ' cd / && echo "Initialized empty Git repository in /" > expected && git init --bare > result && - test_cmp expected result + test_i18ncmp expected result ' test_vars 'auto gitdir, root' "." "" ""
Signature · 1 line
2.26.2.672.g232c24e857
PATCH 2/2 CI: enable t1509 in Travis and GitHub Actions
In reply to Đoàn Trần Công Danh--- ci/lib.sh | 13 +++++++++++++ ci/run-docker-build.sh | 3 +++ 2 files changed, 16 insertions(+)
ci/lib.sh +13 -0
@@ -113,6 +113,7 @@ then export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" export GIT_TEST_OPTS="--verbose-log -x --immediate" MAKEFLAGS="$MAKEFLAGS --jobs=2" + t1509_allowed=YES elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" then CI_TYPE=azure-pipelines
@@ -162,6 +163,7 @@ then echo "::add-matcher::ci/git-problem-matcher.json" test linux-musl = "$jobname" || MAKEFLAGS="$MAKEFLAGS TEST_SHELL_PATH=/bin/sh" + t1509_allowed=YES else echo "Could not identify CI type" >&2 env >&2
@@ -184,6 +186,17 @@ export DEVELOPER=1 export DEFAULT_TEST_TARGET=prove export GIT_TEST_CLONE_2GB=true +if test "$t1509_allowed" = YES +then + case "$jobname" in + osx-*) ;; + *) + chmod a+w / || sudo chmod a+w / || true + export IKNOWWHATIAMDOING=YES + ;; + esac +fi + case "$jobname" in linux-clang|linux-gcc) if [ "$jobname" = linux-gcc ]
ci/run-docker-build.sh +3 -0
@@ -58,6 +58,8 @@ else test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir" fi +chmod a+w / + # Build and test command $switch_cmd su -m -l $CI_USER -c " set -ex
@@ -68,6 +70,7 @@ command $switch_cmd su -m -l $CI_USER -c " export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB' export MAKEFLAGS='$MAKEFLAGS' export cache_dir='$cache_dir' + export IKNOWWHATIAMDOING=YES cd /usr/src/git test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove make
Signature · 1 line
2.26.2.672.g232c24e857
Quoted 3 lines · Đoàn Trần Công Danh
It's our long desire to enable t1509 in CI system [1]
This is here to enable it.
Yuck.
It's not like having a single repository at /.git that govern everything on the machine is a usecase we care about, but if it is easily ported with just two patches, and the task has already been done, then why not? ;-)
Quoted 11 lines
[1]: https://lore.kernel.org/git/[email protected]/
Đoàn Trần Công Danh (2):
t1509: correct i18n test
CI: enable t1509 in Travis and GitHub Actionsci/lib.sh | 13 +++++++++++++ ci/run-docker-build.sh | 3 +++ t/t1509-root-work-tree.sh | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-)
Re: [PATCH 1/2] t1509: correct i18n test
In reply to Đoàn Trần Công DanhQuoted 24 lines · Đoàn Trần Công Danh
git-init(1)'s messages is subjected to i18n.
They should be tested by test_i18n* family.Fix them.
Signed-off-by Đoàn Trần Công Danh <[email protected]>--- t/t1509-root-work-tree.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)t/t1509-root-work-tree.sh +1
-1@@ -221,7 +221,7 @@ test_expect_success 'setup' ' rm -rf /.git && echo "Initialized empty Git repository in /.git/" > expected && git init > result && - test_cmp expected result + test_i18ncmp expected result ' test_vars 'auto gitdir, root' ".git" "/" ""
t/t1509-root-work-tree.sh test_expect_success 'setup' ' · line 252
Quoted 8 lines
t/t1509-root-work-tree.sh +1
-1@@ -246,7 +246,7 @@ test_expect_success 'setup' ' cd / && echo "Initialized empty Git repository in /" > expected && git init --bare > result && - test_cmp expected result + test_i18ncmp expected result ' test_vars 'auto gitdir, root' "." "" ""
OK. It shows how rarely (if ever) this test script is actually exercised that we need fixes like these. Well done.
Thanks.
Re: [PATCH 2/2] CI: enable t1509 in Travis and GitHub Actions
In reply to Đoàn Trần Công DanhQuoted 27 lines · Đoàn Trần Công Danh
Signed-off-by Đoàn Trần Công Danh <[email protected]>--- ci/lib.sh | 13 +++++++++++++ ci/run-docker-build.sh | 3 +++ 2 files changed, 16 insertions(+)ci/lib.sh +2
-0@@ -113,6 +113,7 @@ then export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" export GIT_TEST_OPTS="--verbose-log -x --immediate" MAKEFLAGS="$MAKEFLAGS --jobs=2" + t1509_allowed=YES elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" then CI_TYPE=azure-pipelines@@ -162,6 +163,7 @@ then echo "::add-matcher::ci/git-problem-matcher.json" test linux-musl = "$jobname" || MAKEFLAGS="$MAKEFLAGS TEST_SHELL_PATH=/bin/sh" + t1509_allowed=YES else echo "Could not identify CI type" >&2 env >&2
ci/lib.sh export DEVELOPER=1 · line 195
Quoted 10 lines
ci/lib.sh +7
-0@@ -184,6 +186,17 @@ export DEVELOPER=1 export DEFAULT_TEST_TARGET=prove export GIT_TEST_CLONE_2GB=true +if test "$t1509_allowed" = YES +then + case "$jobname" in + osx-*) ;; + *) + chmod a+w / || sudo chmod a+w / || true + export IKNOWWHATIAMDOING=YES
Eeeww ;-) This makes readers wonder where we did not enable the test and why. Perhaps throw in a matching
t1509_allowed=NO
in the azure thing for completeness?
Also, do we want to give a more descriptive name than t1509 to the variable, say, ROOT_WORK_TREE_TEST_ALLOWED?
Quoted 14 lines
ci/run-docker-build.sh +2
-0@@ -58,6 +58,8 @@ else test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir" fi +chmod a+w / + # Build and test command $switch_cmd su -m -l $CI_USER -c " set -ex
ci/run-docker-build.sh command $switch_cmd su -m -l $CI_USER -c " · line 76
Quoted 7 lines
ci/run-docker-build.sh +1
-0@@ -68,6 +70,7 @@ command $switch_cmd su -m -l $CI_USER -c " export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB' export MAKEFLAGS='$MAKEFLAGS' export cache_dir='$cache_dir' + export IKNOWWHATIAMDOING=YES cd /usr/src/git test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove make
Big EWWWWWWwwww. Do we need to do this for _all_ tests, not selectively only while running t1509? This makes me worried as a test by mistake can easily corrupt the VM and invalidating the tests; I know we get a fresh one every time, so there is no permanent harm done by corrupting it, but having one fewer thing we have to worry about is always better than having one more thing.
Re: [PATCH 2/2] CI: enable t1509 in Travis and GitHub Actions
Quoted 12 lines · Junio C Hamano
ci/lib.sh export DEVELOPER=1 · line 195
Quoted 7 lines · Đoàn Trần Công Danh
ci/lib.sh +7
-0+if test "$t1509_allowed" = YES +then + case "$jobname" in + osx-*) ;; + *) + chmod a+w / || sudo chmod a+w / || true + export IKNOWWHATIAMDOING=YESEeeww ;-) This makes readers wonder where we did not enable the test and why. Perhaps throw in a matching
Quoted 3 lines
t1509_allowed=NOin the azure thing for completeness?
I was thinking about allowing people set it via environment variable and check, but it seems too risky, now.
Perhaps, always reset it to NO before the checking for $CI_TYPE, and enable it selectively for only Travis, and GitHub Actions.
I didn't enable it for Azure because I can't assure it ;).
Quoted 2 lines
Also, do we want to give a more descriptive name than t1509 to the variable, say,
ROOT_WORK_TREE_TEST_ALLOWED?
Yeah, I think all caps is better for this risky variable. I think using T1509_ROOT_WORK_TREE_TEST_ALLOWED is better, to point out which test is risky. But it require future tests with root work-tree must be written in t1509, since it's rare usecase, It'd be fine, I think.
Quoted 21 lines
Quoted 21 lines
ci/run-docker-build.sh +3
-0@@ -58,6 +58,8 @@ else test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir" fi +chmod a+w / + # Build and test command $switch_cmd su -m -l $CI_USER -c " set -ex@@ -68,6 +70,7 @@ command $switch_cmd su -m -l $CI_USER -c " export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB' export MAKEFLAGS='$MAKEFLAGS' export cache_dir='$cache_dir' + export IKNOWWHATIAMDOING=YES cd /usr/src/git test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove
Quoted 8 lines
ci/run-docker-build.sh command $switch_cmd su -m -l $CI_USER -c " · line 76
Quoted 1 line
ci/run-docker-build.sh +0
-0makeBig EWWWWWWwwww. Do we need to do this for _all_ tests, not selectively only while running t1509? This makes me worried as a test by mistake can easily corrupt the VM and invalidating the tests; I know we get a fresh one every time, so there is no permanent harm done by corrupting it, but having one fewer thing we have to worry about is always better than having one more thing.
Perhaps pass this variable all the way down from ci/lib.sh? Adding another variable into t1509 (except T1509_*) doesn't make it less risky.
Or should we add T1509_ prefix to this env var?
Signature · 1 line
Danh
Re: [PATCH 2/2] CI: enable t1509 in Travis and GitHub Actions
Quoted 22 lines · Đoàn Trần Công Danh
Quoted 13 lines
Quoted 13 lines
ci/run-docker-build.sh +3
-0+chmod a+w / + # Build and test command $switch_cmd su -m -l $CI_USER -c " set -ex@@ -68,6 +70,7 @@ command $switch_cmd su -m -l $CI_USER -c " export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB' export MAKEFLAGS='$MAKEFLAGS' export cache_dir='$cache_dir' + export IKNOWWHATIAMDOING=YES cd /usr/src/git test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.proveQuoted 8 lines
Review command $switch_cmd su -m -l $CI_USER -c " · line 76
Quoted 1 line
(quoted diff) +0
-0makeBig EWWWWWWwwww. Do we need to do this for _all_ tests, not selectively only while running t1509? This makes me worried as a test by mistake can easily corrupt the VM and invalidating the tests; I know we get a fresh one every time, so there is no permanent harm done by corrupting it, but having one fewer thing we have to worry about is always better than having one more thing.
Quoted 4 lines
Perhaps pass this variable all the way down from
ci/lib.sh? Adding another variable into t1509 (except T1509_*) doesn't make it less risky.
Or should we addT1509_prefix to this env var?
I was not worried about any environment variable, but the "let's make the root directory writable by anybody during _all_ tests", when we need such a crazy permission bits on the filesystem only while running t1509 and not any other time, stood out as extremely yucky.