diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-06-25 16:42:58 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-06-25 16:42:58 -0400 |
| commit | 460f18e980342b41fab494cd2b7de217fd4a0feb (patch) | |
| tree | 0186e4364bcd57cbd54431b3ff2bf7b8539511a6 | |
| parent | 7e905482ccc906c4ceb4b00604fceeae74b374ce (diff) | |
| parent | b9807bcf6a55ff1a3bffa44ab1ea6a50dfbdf186 (diff) | |
Merge remote-tracking branch 'timday/lustre-updates' into HEAD
| -rwxr-xr-x | build-test-kernel | 11 | ||||
| -rw-r--r-- | tests/fs/lustre/lustre-libs.sh | 15 | ||||
| -rw-r--r-- | tests/prelude.sh | 2 |
3 files changed, 19 insertions, 9 deletions
diff --git a/build-test-kernel b/build-test-kernel index cd4ff25..b34a20d 100755 --- a/build-test-kernel +++ b/build-test-kernel @@ -18,7 +18,7 @@ checkdep bc ktest_njobs=$(nproc) ktest_precise=false -ktest_compiler=gcc +ktest_compiler="${CC:-gcc}" ktest_skip_kernel_config=false COVERAGE="" # doing code coverage? @@ -122,6 +122,14 @@ run_ktest() "$KTEST" "$arg" $KTESTARGS "$@" } +map_clang_version() { + case "$ktest_compiler" in + clang) echo "1" ;; + clang-[0-9]*) echo "-${ktest_compiler#clang-}" ;; + *) echo "" ;; + esac +} + do_make() { if [[ -n $CROSS_COMPILE ]]; then @@ -132,6 +140,7 @@ do_make() make --jobs="$ktest_njobs" \ --directory="$ktest_kernel_source" \ CC="$ktest_compiler" \ + LLVM="$(map_clang_version)" \ O="$ktest_kernel_build" \ INSTALL_MOD_PATH="$ktest_kernel_binary" \ "${ktest_kernel_make_append[@]}" \ diff --git a/tests/fs/lustre/lustre-libs.sh b/tests/fs/lustre/lustre-libs.sh index 73763f9..bba1a45 100644 --- a/tests/fs/lustre/lustre-libs.sh +++ b/tests/fs/lustre/lustre-libs.sh @@ -91,7 +91,7 @@ else if [[ -f /host/tmp/ktest-lustre.env ]]; then eval $(cat /host/tmp/ktest-lustre.env) else - FSTYPE="mem" + FSTYPE="wbcfs" fi fi set -u @@ -173,11 +173,12 @@ function setup_lustre_mgs() "$lustre_pkg_path/lustre/utils/mkfs.lustre" --mgs --fsname=lustre lustre-mgs/mgs mount -t lustre lustre-mgs/mgs /mnt/lustre-mgs ;; - mem) - export OSD_MEM_TGT_TYPE="MGT" - export OSD_MEM_INDEX="0" - export OSD_MEM_MGS_NID="$(hostname -i)@tcp" - run_tf "$lustre_pkg_path/lustre/utils/mount.lustre" -v /mnt/lustre-mgs + wbcfs) + export OSD_WBC_TGT_TYPE="MGT" + export OSD_WBC_INDEX="0" + export OSD_WBC_MGS_NID="$(hostname -i)@tcp" + export OSD_WBC_FSNAME="lustre" + run_tf "$lustre_pkg_path/lustre/utils/mount.lustre" -v lustre-wbcfs /mnt/lustre-mgs ;; *) echo "Unsupported OSD!" @@ -198,7 +199,7 @@ function setup_lustrefs() FSTYPE="$FSTYPE" "$lustre_pkg_path/lustre/tests/llmount.sh" - # Disable identity upcall (for OSD mem) + # Disable identity upcall (for OSD wbcfs) "$LCTL" set_param mdt.*.identity_upcall=NONE mount -t lustre diff --git a/tests/prelude.sh b/tests/prelude.sh index a2b3316..ced9770 100644 --- a/tests/prelude.sh +++ b/tests/prelude.sh @@ -34,7 +34,7 @@ if [[ ! -v ktest_cpus ]]; then ktest_kernel_config_require=() ktest_kernel_config_require_soft=() ktest_qemu_append=() - ktest_compiler=gcc + ktest_compiler="${CC:-gcc}" ktest_allow_taint=false ktest_tests_unknown=false |