From 34cbe9543bbf9f7613408be3d4f6683b7d7d37aa Mon Sep 17 00:00:00 2001
From: Lucas Caudill <lcaudill@lanl.gov>
Date: Thu, 28 Sep 2023 20:02:34 +0000
Subject: [PATCH] some suggestions

---
 .gitignore       |  2 +-
 bin/ch-test      | 12 ++++++------
 doc/ch-test.rst  |  2 +-
 test/Makefile.am |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index bec046b15..a552538e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,7 @@ a.out
 /lib/version.py
 /lib/version.sh
 /lib/version.txt
-/test/61_force-auto.bats
+/test/force-auto.bats
 /test/docs-sane
 /test/fixtures/symlink-to-tmp
 /test/force-auto
diff --git a/bin/ch-test b/bin/ch-test
index 10cb40a6f..471430cc2 100755
--- a/bin/ch-test
+++ b/bin/ch-test
@@ -54,8 +54,8 @@ Usage:
 
   $ $(basename "$0") [PHASE] [--scope SCOPE] [--pack-fmt FMT] [OPTIONS]
 
-Valid phases: build, build-images, run, examples, all, mk-perm-dirs, clean,
-              rm-perm-dirs, rootemu, most
+Valid phases: build-images, build, rootemu, run, examples, all, most, mk-perm-dirs, clean,
+              rm-perm-dirs
 Valid scopes: quick, standard, full
 Valid pack formats: squash-mount, tar-unpack, squash-unpack
 
@@ -665,8 +665,8 @@ test_one_file () {
 test_rootemu () {
     if command -v ch-image > /dev/null 2>&1; then
         echo 'executing root emulation tests...'
-        bats 61_force-auto.bats
-        echo 'yes' > "$TMP_/rootemu"
+        bats force-auto.bats
+        echo yes > "$TMP_/rootemu"
     elif [[ -n "$1" ]]; then
         printf "error: ch-image required, not found\n"
         exit 1
@@ -772,8 +772,8 @@ if [[ ! -d $TMP_ ]]; then
     chmod 700 "$TMP_"
 fi
 
-# Record that we haven’t (yet) un the “rootemu” tests
-echo 'no' > "$TMP_/rootemu"
+# Record that we haven’t (yet) run the “rootemu” tests
+echo no > "$TMP_/rootemu"
 
 # Find test directories. Note some of this gets rewritten at install time.
 CHTEST_DIR=${ch_base}/test
diff --git a/doc/ch-test.rst b/doc/ch-test.rst
index da8c25434..f8a3a2737 100644
--- a/doc/ch-test.rst
+++ b/doc/ch-test.rst
@@ -74,7 +74,7 @@ allows trading off thoroughness versus time.
     images directory produced by a successful :code:`build` phase, which can
     be copied from the build system if it’s not also the run system.
 
-  :code:`rooteum`
+  :code:`rootemu`
     Test the root emulation modes (:code:`seccomp`, :code:`fakeroot`, and
     :code:`none`) on various linux distributions.
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 168f942de..29a2d3676 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -68,15 +68,15 @@ sotest/sotest
 
 CLEANFILES = $(sobuilts) \
              docs-sane force-auto make-perms-test \
-             61_force-auto.bats
+             force-auto.bats
 
 if ENABLE_TEST
 nobase_test_DATA = $(testfiles)
 nobase_test_SCRIPTS = $(testfiles_exec)
 nobase_nodist_test_SCRIPTS = $(sobuilts)
 if ENABLE_CH_IMAGE  # this means we have Python
-nobase_test_DATA += 61_force-auto.bats
-61_force-auto.bats: force-auto
+nobase_test_DATA += force-auto.bats
+force-auto.bats: force-auto
 	./$< > $@
 endif
 # See comment about symlinks in examples/Makefile.am.