Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

Commit

Permalink
some suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
lucaudill committed Sep 28, 2023
1 parent 5bb6158 commit 34cbe95
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions bin/ch-test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/ch-test.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 34cbe95

Please sign in to comment.