@@ -343,8 +343,6 @@ setup_env() { local mode
343
343
is_mode_debug " ${mode} " && VIRTME_BUILD_DIR+=" -debug"
344
344
is_mode_btf " ${mode} " && VIRTME_BUILD_DIR+=" -btf"
345
345
[ -n " ${INPUT_BUILD_SUFFIX} " ] && VIRTME_BUILD_DIR+=" -${INPUT_BUILD_SUFFIX} "
346
- rm -rf " ${VIRTME_CURRENT_BUILD_DIR} "
347
- ln -s " ${VIRTME_BUILD_DIR} " " ${VIRTME_CURRENT_BUILD_DIR} "
348
346
349
347
VIRTME_PERF_DIR=" ${VIRTME_BUILD_DIR} /tools/perf"
350
348
VIRTME_TOOLS_SBIN_DIR=" ${VIRTME_BUILD_DIR} /tools/sbin"
@@ -380,10 +378,12 @@ setup_env() { local mode
380
378
" ${CCACHE_DIR} "
381
379
chmod 777 " ${VIRTME_CACHE_DIR} " # to let users writting files there, e.g. clangd
382
380
381
+ rm -rf " ${VIRTME_CURRENT_BUILD_DIR} "
382
+ ln -s " ${VIRTME_BUILD_DIR} " " ${VIRTME_CURRENT_BUILD_DIR} "
383
+
383
384
if is_ci; then
384
385
# Root dir: not to have to go down dirs to get artifacts
385
386
RESULTS_DIR=" ${KERNEL_SRC}${INPUT_CI_RESULTS_DIR: +/ ${INPUT_CI_RESULTS_DIR} } "
386
- mkdir -p " ${RESULTS_DIR} "
387
387
388
388
: " ${INPUT_CPUS:= $(nproc)} " # use all available resources
389
389
: " ${INPUT_GCOV:= 1} "
@@ -393,7 +393,6 @@ setup_env() { local mode
393
393
# avoid override
394
394
RESULTS_DIR=" $( _get_results_dir " ${mode} " ) "
395
395
rm -rf " ${RESULTS_DIR} "
396
- mkdir -p " ${RESULTS_DIR} "
397
396
398
397
: " ${INPUT_CPUS:= 2} " # limit to 2 cores for now
399
398
: " ${INPUT_GCOV:= 0} "
@@ -423,6 +422,12 @@ setup_env() { local mode
423
422
VIRTME_RUN_QEMU_OPTS+=(-device vmcoreinfo)
424
423
fi
425
424
425
+ # To avoid overriding files
426
+ if [ " ${INPUT_VSOCK_CID} " != " ${DEFAULT_VSOCK_CID} " ]; then
427
+ RESULTS_DIR+=" /${INPUT_VSOCK_CID} "
428
+ fi
429
+
430
+ mkdir -p " ${RESULTS_DIR} "
426
431
OUTPUT_VIRTME=" ${RESULTS_DIR} /output.log"
427
432
TESTS_SUMMARY=" ${RESULTS_DIR} /summary.txt"
428
433
CONCLUSION=" ${RESULTS_DIR} /conclusion.txt"
@@ -650,7 +655,7 @@ gen_kconfig() { local mode kconfig=() vck rc=0
650
655
# Disable components present in syzbot and not needed here
651
656
kconfig+=(
652
657
-d WLAN -d WIRELESS -d HAMRADIO -d CAN -d BT -d CAIF -d NFC
653
- -d ATA -d MEDIA_SUPPORT -d INFINIBAND -d STAGING
658
+ -d ATA -d MEDIA_SUPPORT -d INFINIBAND -d STAGING -d HID
654
659
-d X86_PLATFORM_DEVICES -d BATMAN_ADV -d OPENVSWITCH -d MPLS
655
660
-d QRTR -d IP_DCCP -d RDS -d DLM -d IP_SCTP
656
661
-d BCACHEFS_FS -d F2FS_FS -d BTRFS_FS -d OCFS2_FS -d XFS_FS
0 commit comments