From da8cbe3c214f078857e836cc7faf0920dc1f322f Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Mon, 5 Jul 2021 03:44:08 +0300 Subject: [PATCH] common/build-style/: enable running tests in parallel --- common/build-style/cmake.sh | 6 +++++- common/build-style/configure.sh | 6 +++++- common/build-style/gnu-configure.sh | 6 +++++- common/build-style/gnu-makefile.sh | 6 +++++- common/build-style/perl-module.sh | 6 +++++- common/environment/setup/sourcepkg.sh | 3 ++- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 401dabad31c8..c7ffd16fee21 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -113,7 +113,11 @@ do_check() { : ${make_check_target:=test} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh index 0963fc347934..b846a1a77572 100644 --- a/common/build-style/configure.sh +++ b/common/build-style/configure.sh @@ -29,7 +29,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh index 8121136cd121..b09de442b05b 100644 --- a/common/build-style/gnu-configure.sh +++ b/common/build-style/gnu-configure.sh @@ -30,7 +30,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh index d7ea148fc483..0f7afa7d3695 100644 --- a/common/build-style/gnu-makefile.sh +++ b/common/build-style/gnu-makefile.sh @@ -30,7 +30,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=check} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh index b9a01b13cfa9..d47945b33d36 100644 --- a/common/build-style/perl-module.sh +++ b/common/build-style/perl-module.sh @@ -79,7 +79,11 @@ do_check() { : ${make_cmd:=make} : ${make_check_target:=test} - ${make_cmd} ${make_check_args} ${make_check_target} + if [ -z "$disable_parallel_check" ]; then + ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target} + else + ${make_cmd} ${make_check_args} ${make_check_target} + fi } do_install() { diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index bc06f745b78a..1fd541f1e715 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -13,7 +13,8 @@ unset -v cmake_builddir meson_builddir unset -v meson_crossfile unset -v gemspec unset -v go_import_path go_package go_mod_mode -unset -v patch_args disable_parallel_build keep_libtool_archives make_use_env +unset -v patch_args disable_parallel_build disable_parallel_check +unset -v keep_libtool_archives make_use_env unset -v reverts subpackages makedepends hostmakedepends checkdepends depends restricted unset -v nopie build_options build_options_default bootstrap repository reverts unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH