diff options
| -rwxr-xr-x | lib/testrunner | 4 | ||||
| -rw-r--r-- | tests/fs/bcachefs/bcachefs-test-libs.sh | 9 | ||||
| -rw-r--r-- | tests/prelude.sh | 7 |
3 files changed, 17 insertions, 3 deletions
diff --git a/lib/testrunner b/lib/testrunner index 6373461..71e4eb4 100755 --- a/lib/testrunner +++ b/lib/testrunner @@ -13,8 +13,6 @@ 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" @@ -175,6 +173,8 @@ trap 'pkill -P $$ >/dev/null' EXIT cd /root export ktest_failfast +export ktest_interactive +export ktest_verbose export ktest_out set +e diff --git a/tests/fs/bcachefs/bcachefs-test-libs.sh b/tests/fs/bcachefs/bcachefs-test-libs.sh index 2b96d54..25978d1 100644 --- a/tests/fs/bcachefs/bcachefs-test-libs.sh +++ b/tests/fs/bcachefs/bcachefs-test-libs.sh @@ -6,6 +6,15 @@ . $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../../test-libs.sh +if $ktest_interactive; then + require-git git://evilpiepirate.org/git/bcachefs-tools.git + init_build_bcachefs_tools() { + cd $ktest_dir/tests/fs/bcachefs/bcachefs-tools + make -j PREFIX=/usr install + } +fi + + require-kernel-config BCACHEFS_FS if [[ ! -v NO_BCACHEFS_DEBUG ]]; then diff --git a/tests/prelude.sh b/tests/prelude.sh index e06da25..0569236 100644 --- a/tests/prelude.sh +++ b/tests/prelude.sh @@ -3,7 +3,11 @@ . $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../lib/common.sh -if [[ ! -v ktest_verbose ]]; then +if [[ ! -v ktest_interactive ]]; then + ktest_interactive=false +fi + +if [[ ! -v ktest_cpus ]]; then ktest_verbose=false ktest_priority=0 ktest_cpus=$(nproc) @@ -310,6 +314,7 @@ init_noop() run_init_hooks() { for h in `declare -F|grep -Eo '\<init_.*'`; do + echo "hook $h" $h done } |