try different skip method

hpc · Oct 3, 2023 · ed765cc · ed765cc
1 parent 0acc620
commit ed765cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/bin/ch-test b/bin/ch-test
@@ -664,9 +664,13 @@ test_one_file () {
 
 test_rootemu () {
     if command -v ch-image > /dev/null 2>&1; then
-        echo 'executing root emulation tests...'
-        bats force-auto.bats
-        echo yes > "$TMP_/rootemu"
+        if [[ "$scope" != "full" ]]; then
+            echo "skipping root emulation tests (full scope only)"
+        else
+            echo 'executing root emulation tests...'
+            bats force-auto.bats
+            echo yes > "$TMP_/rootemu"
+        fi
     elif [[ -n "$1" ]]; then
         printf "error: ch-image required, not found\n"
         exit 1

diff --git a/test/force-auto.py.in b/test/force-auto.py.in
@@ -315,10 +315,6 @@ print("""\
 
 load common
 
-setup_file () {
-   scope full
-}
-
 setup () {
     [[ $CH_TEST_BUILDER = ch-image ]] || skip 'ch-image only'
     [[ $CH_IMAGE_CACHE = enabled ]] || skip 'bucache enabled only'