From ed765ccb9cf09da6f108ce65aa97f9c6913a20d4 Mon Sep 17 00:00:00 2001
From: Lucas Caudill <lcaudill@lanl.gov>
Date: Tue, 3 Oct 2023 20:47:55 +0000
Subject: [PATCH] try different skip method

---
 bin/ch-test           | 10 +++++++---
 test/force-auto.py.in |  4 ----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/ch-test b/bin/ch-test
index 83811c3f3..61e70b8cf 100755
--- 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
index fbd1fe948..1e17ba153 100644
--- 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'