diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-06-26 20:10:33 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-06-26 20:10:33 -0400 |
| commit | 6cee4fbd667488cbe52cd993626a856ef9f25245 (patch) | |
| tree | 11c8d0b8fda35245fd9e60794656abaa6b15917f | |
| parent | 7c3927bc6856f8dc117b0a757cfab60158a8f28c (diff) | |
Minor improvements
- kernel config updates
- build with make -k, for better error messages
- use nproc command for nr of cpus
- add require-qemu-append
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rwxr-xr-x | build-test-kernel | 6 | ||||
| -rw-r--r-- | lib/parse-test.sh | 15 | ||||
| -rw-r--r-- | tests/prelude.sh | 10 |
3 files changed, 22 insertions, 9 deletions
diff --git a/build-test-kernel b/build-test-kernel index 48a0ad1..2a8ec5f 100755 --- a/build-test-kernel +++ b/build-test-kernel @@ -15,7 +15,7 @@ checkdep make ktest_kernel_source="." # dir of kernel source # set with: -k <path> # defaults: current directory -ktest_njobs=$(($(grep -c '^processor' /proc/cpuinfo) * 2)) +ktest_njobs=$(nproc) COVERAGE="" # doing code coverage? MAKEARGS=() @@ -180,10 +180,10 @@ build_kernel() case $KERNEL_ARCH in mips) - do_make vmlinuz + do_make -k vmlinuz ;; *) - do_make + do_make -k ;; esac diff --git a/lib/parse-test.sh b/lib/parse-test.sh index f642dde..5d87af8 100644 --- a/lib/parse-test.sh +++ b/lib/parse-test.sh @@ -1,7 +1,7 @@ parse_test_deps() { - ktest_cpus=$(grep -c '^processor' /proc/cpuinfo) + ktest_cpus=$(nproc) ktest_mem="" ktest_timeout="" ktest_kernel_append=() @@ -9,6 +9,7 @@ parse_test_deps() ktest_scratch_devs=() ktest_make_install=() ktest_kernel_config_require=() + ktest_qemu_append=() local NEXT_SCRATCH_DEV="b" local TESTPROG=$1 @@ -101,6 +102,18 @@ parse_test_deps() IFS=$OLDIFS } + require-qemu-append() + { + local OLDIFS=$IFS + IFS=',' + + for i in $1; do + ktest_kernel_config_require+=("$i") + done + + IFS=$OLDIFS + } + require-kernel-append() { ktest_kernel_append+=($1) diff --git a/tests/prelude.sh b/tests/prelude.sh index af58388..caf1294 100644 --- a/tests/prelude.sh +++ b/tests/prelude.sh @@ -11,6 +11,8 @@ case $ktest_arch in require-kernel-config IO_DELAY_0XED require-kernel-config 64BIT=n require-kernel-config ACPI # way slower without it, do not know why + require-kernel-config UNWINDER_FRAME_POINTER + require-kernel-config HARDLOCKUP_DETECTOR have_kvmguest=1 have_virtio=1 @@ -20,9 +22,11 @@ case $ktest_arch in require-kernel-config SMP require-kernel-config MCORE2 # optimize for core2 require-kernel-config IO_DELAY_0XED - require-kernel-config IA32_EMULATION + #require-kernel-config IA32_EMULATION require-kernel-config 64BIT require-kernel-config ACPI # way slower without it, do not know why + require-kernel-config UNWINDER_FRAME_POINTER + require-kernel-config HARDLOCKUP_DETECTOR have_kvmguest=1 have_virtio=1 @@ -181,12 +185,8 @@ require-kernel-config FTRACE_SYSCALLS require-kernel-config FUNCTION_TRACER #require-kernel-config ENABLE_DEFAULT_TRACERS -# Debugging options -require-kernel-config UNWINDER_FRAME_POINTER - require-kernel-config PANIC_ON_OOPS require-kernel-config SOFTLOCKUP_DETECTOR -require-kernel-config HARDLOCKUP_DETECTOR require-kernel-config DETECT_HUNG_TASK #require-kernel-config DEFAULT_HUNG_TASK_TIMEOUT=30 require-kernel-config WQ_WATCHDOG |