summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2024-08-08 21:25:51 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2024-08-08 21:26:26 -0400
commit3e3d91f988d4fab26782b268a9d968f0e0df04cb (patch)
tree158760849b69fb279049eb7d7c77644b15b0a51f
parent8f1e025089b291edfe585c2848bd0373abc4b476 (diff)
Don't build xfstests noninteractively
building xfstests in the CI is unreliable, for various reasons; we'll have to do it manually as needed. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rwxr-xr-xlib/testrunner2
-rw-r--r--tests/fs/fstests.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/testrunner b/lib/testrunner
index fb68ef6..6373461 100755
--- a/lib/testrunner
+++ b/lib/testrunner
@@ -13,6 +13,8 @@ export PATH=$PATH:/root/.cargo/bin
. /host/$ktest_env
+export ktest_interactive
+
ktest_dir="/host/$ktest_dir"
ktest_tmp="/host/$ktest_tmp"
ktest_out="/host/$ktest_out"
diff --git a/tests/fs/fstests.sh b/tests/fs/fstests.sh
index 7fb140b..cb6d2c9 100644
--- a/tests/fs/fstests.sh
+++ b/tests/fs/fstests.sh
@@ -62,7 +62,9 @@ run_fstests()
mkdir -p /mnt/test /mnt/scratch
- run_quiet "building $(basename $i)" make -j $ktest_cpus -C "$ktest_dir/tests/fs/xfstests"
+ if $ktest_interactive; then
+ run_quiet "building $(basename $i)" make -j $ktest_cpus -C "$ktest_dir/tests/fs/xfstests"
+ fi
rm -rf /ktest-out/xfstests