From f3188d3206b2be5c0d2101ea19ce0b8b21f2c268 Mon Sep 17 00:00:00 2001 From: Lucas Caudill Date: Fri, 29 Sep 2023 20:18:17 +0000 Subject: [PATCH] appease shellcheck, remove most phase --- bin/ch-test | 26 ++------------------------ doc/ch-test.rst | 4 ---- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/bin/ch-test b/bin/ch-test index 14e97fea6..4ec03d70a 100755 --- a/bin/ch-test +++ b/bin/ch-test @@ -813,7 +813,7 @@ fi while [[ $# -gt 0 ]]; do opt=$1; shift case $opt in - all|build|build-images|clean|examples|mk-perm-dirs|most|rm-perm-dirs|rootemu|run) + all|build|build-images|clean|examples|mk-perm-dirs|rm-perm-dirs|rootemu|run) require_unset phase phase=$opt ;; @@ -1189,28 +1189,6 @@ case $phase in done echo ;; - most) - phase=build - dir_tar_mk - builder_check - test_make - test_build_images - test_build - - phase=run - dir_img_mk - dir_tar_check - test_make - test_run - - phase=examples - dir_tar_check - test_make - test_examples - - # Kobe. - win - ;; one-file) test_one_file win @@ -1222,7 +1200,7 @@ case $phase in ;; rootemu) if [[ $scope != full ]]; then - printf "error: rootemu incompatible with scope: $scope\n" + printf "error: rootemu incompatible with scope: %s\n" "$scope" exit 1 fi test_rootemu "foo" diff --git a/doc/ch-test.rst b/doc/ch-test.rst index f8a3a2737..405e7f541 100644 --- a/doc/ch-test.rst +++ b/doc/ch-test.rst @@ -86,10 +86,6 @@ allows trading off thoroughness versus time. Execute phases :code:`build`, :code:`rootemu`, :code:`run`, and :code:`examples`, in that order. - :code:`most` - Execute phases :code:`build`, :code:`run`, and :code:`examples`, in that - order. Equivalent to :code:`all`, without the :code:`rootemu` phase. - :code:`mk-perm-dirs` Create the filesystem permissions directories. Requires :code:`--perm-dirs`.