[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/14] check-block.sh: passthrough -jN flag of make to -j N flag o
|
From: |
Paolo Bonzini |
|
Subject: |
[PULL 08/14] check-block.sh: passthrough -jN flag of make to -j N flag of check |
|
Date: |
Thu, 27 Jan 2022 12:10:31 +0100 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This improves performance of running iotests during "make -jN check".
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211223183933.1497037-1-vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/check-block.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/check-block.sh b/tests/check-block.sh
index f86cb863de..d98d49ad63 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -74,10 +74,17 @@ cd tests/qemu-iotests
# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
export QEMU_CHECK_BLOCK_AUTO=1
export PYTHONUTF8=1
+# If make was called with -jN we want to call ./check with -j N. Extract the
+# flag from MAKEFLAGS, so that if it absent (or MAKEFLAGS is not defined), JOBS
+# would be an empty line otherwise JOBS is prepared string of flag with value:
+# "-j N"
+# Note, that the following works even if make was called with "-j N" or even
+# "--jobs N", as all these variants becomes simply "-jN" in MAKEFLAGS variable.
+JOBS=$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9]\+\)\( .*\|$\)/-j
\2/p')
ret=0
for fmt in $format_list ; do
- ${PYTHON} ./check -makecheck -$fmt $group || ret=1
+ ${PYTHON} ./check $JOBS -makecheck -$fmt $group || ret=1
done
exit $ret
--
2.34.1
- [PULL 06/14] exec/cpu: Make host pages variables / macros 'target agnostic', (continued)
- [PULL 06/14] exec/cpu: Make host pages variables / macros 'target agnostic', Paolo Bonzini, 2022/01/27
- [PULL 07/14] meson: Use find_program() to resolve the entitlement.sh script, Paolo Bonzini, 2022/01/27
- [PULL 04/14] intc: Unexport InterruptStatsProviderClass-related functions, Paolo Bonzini, 2022/01/27
- [PULL 01/14] build-sys: fix a meson deprecation warning, Paolo Bonzini, 2022/01/27
- [PULL 02/14] build-sys: fix undefined ARCH error, Paolo Bonzini, 2022/01/27
- [PULL 10/14] build: make check-block a meson test, Paolo Bonzini, 2022/01/27
- [PULL 13/14] qapi: Cleanup SGX related comments and restore @section-size, Paolo Bonzini, 2022/01/27
- [PULL 05/14] meson.build: Use a function from libfdt 1.5.1 for the library check, Paolo Bonzini, 2022/01/27
- [PULL 11/14] qemu-iotests: require at least an argument to check-block.sh, Paolo Bonzini, 2022/01/27
- [PULL 03/14] docker: add msitools to Fedora/mingw cross, Paolo Bonzini, 2022/01/27
- [PULL 08/14] check-block.sh: passthrough -jN flag of make to -j N flag of check,
Paolo Bonzini <=
- [PULL 09/14] scripts/mtest2make: add support for SPEED=thorough, Paolo Bonzini, 2022/01/27
- [PULL 14/14] configure: fix parameter expansion of --cross-cc-cflags options, Paolo Bonzini, 2022/01/27
- Re: [PULL 00/14] Misc patches for 2022-01-27, Peter Maydell, 2022/01/27