From 29886b804d72e07cf6b24ba6880c7e84d5d4c413 Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Thu, 15 Aug 2024 23:12:40 +0100 Subject: [PATCH] Meta: Use cross-platform method to get number of CPUs in `WPT.sh` --- Meta/WPT.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Meta/WPT.sh b/Meta/WPT.sh index 90f38664631..63308fb624d 100755 --- a/Meta/WPT.sh +++ b/Meta/WPT.sh @@ -8,10 +8,12 @@ LADYBIRD_SOURCE_DIR="$(realpath "${DIR}"/..)" WPT_SOURCE_DIR=${WPT_SOURCE_DIR:-"${LADYBIRD_SOURCE_DIR}/Tests/LibWeb/WPT/wpt"} WPT_REPOSITORY_URL=${WPT_REPOSITORY_URL:-"https://github.com/web-platform-tests/wpt.git"} +# shellcheck source=/dev/null +. "${DIR}/shell_include.sh" + LADYBIRD_BINARY=${LADYBIRD_BINARY:-"${LADYBIRD_SOURCE_DIR}/Build/ladybird/bin/Ladybird"} WEBDRIVER_BINARY=${WEBDRIVER_BINARY:-"${LADYBIRD_SOURCE_DIR}/Build/ladybird/bin/WebDriver"} - -WPT_PROCESSES=${WPT_PROCESSES:-$(nproc)} +WPT_PROCESSES=${WPT_PROCESSES:-$(get_number_of_processing_units)} WPT_CERTIFICATES=( "tools/certs/cacert.pem" "${LADYBIRD_SOURCE_DIR}/Build/ladybird/Lagom/cacert.pem" @@ -75,9 +77,6 @@ if [ "$ARG" = "--log" ]; then fi TEST_LIST=( "$@" ) -# shellcheck source=/dev/null -. "${DIR}/shell_include.sh" - exit_if_running_as_root "Do not run WPT.sh as root" ensure_wpt_repository() {