From 1bb5f0d8806cf820ad3a0aafab9327f9c93fa975 Mon Sep 17 00:00:00 2001 From: Lucas Caudill Date: Fri, 13 Oct 2023 18:22:48 +0000 Subject: [PATCH] more suggestions --- bin/ch-test | 10 +++------- test/build/55_cache.bats | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bin/ch-test b/bin/ch-test index c6358a3f8..524e7b506 100755 --- a/bin/ch-test +++ b/bin/ch-test @@ -1206,13 +1206,9 @@ case $phase in done ;; rootemu) - if [[ ($scope != full) && (-z "$with_rootemu") ]]; then - if [[ -z "$scope" ]]; then - scope="standard" - fi - printf "error: rootemu incompatible with scope: %s\n" "$scope" - exit 1 - fi + # assume that “ch-test rootemu” means the user wants to run root + # emulation tests. + with_rootemu="yes" test_rootemu optional # ch-image optional ;; run) diff --git a/test/build/55_cache.bats b/test/build/55_cache.bats index 8cd42bb78..c9086a1e8 100644 --- a/test/build/55_cache.bats +++ b/test/build/55_cache.bats @@ -1238,6 +1238,7 @@ EOF @test "${tag}: ignore patterns" { + # fails unless “__ch-test_ignore__” is included in the global gitignore file. git check-ignore -q __ch-test_ignore__ \ || pedantic_fail 'global ignore not configured'