From patchwork Tue May 18 08:41:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1480092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JwDGuEfr; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FkqQ81K1vz9sRN for ; Tue, 18 May 2021 18:47:44 +1000 (AEST) Received: from localhost ([::1]:41208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1livOA-0002Sp-56 for incoming@patchwork.ozlabs.org; Tue, 18 May 2021 04:47:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1livIO-0007bY-LX for qemu-devel@nongnu.org; Tue, 18 May 2021 04:41:44 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:38470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1livIN-0005Zg-2o for qemu-devel@nongnu.org; Tue, 18 May 2021 04:41:44 -0400 Received: by mail-ed1-x529.google.com with SMTP id o5so1110230edc.5 for ; Tue, 18 May 2021 01:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VzBzspIRtIDQuQTLLmpcCnuBfCb5UPg4rucM0zljC4U=; b=JwDGuEfrJ5DVfVYtacIEFiKH1AxPX+E0gl30MDOdrnv6+IdeGcoEGjtClLpVgzATGq 87yjpy4+1g+k4ICEZxPi4QhCK9hptKTv+Qyfl6DP0lBSYqMXBMQf56/iN0EJUl/HzMfl nXabPhkQ5+m/PWruOaM+sEUbqWpWXj60ClcfSAsOL63XHAh9dBCMiFWgquMnwc3BjklS B1vvtvP9x8lLZ22ismin0p0VTMCOGut93LHW5gx24p1rq22kw7q3rFTN1ryRIXtGFX0f DDqaVXXtw0/KoXPRCI8+oC1CiGTB7WAkSuvmvTkr4nHPS1HdePiNpsvANqq7nbgyELRo Jwhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VzBzspIRtIDQuQTLLmpcCnuBfCb5UPg4rucM0zljC4U=; b=bqnAzTSSS7WA/nlSrtOaicboiE86OQYgYxg0hyXAqhr2etx1Kk/7u8P13Bi8Ujeu8y Ekrf+5sFg5FIoYMwHPXuZvdUYT0dTOm+YQxpFuTPOtWV9HPrKDY6RUVNKf9VYdorc6ms 2c/2R1SpUDilor6KFlv3Y4kXKP7wOKw2JnQjdxTX4R5vHcmdvqg5ofuy/8agbd8fQRae Fi5qZMNmZtfYJ3mJMAHKubg8Hsw49m8iE0pRULxM/RuVP/yHh3vBNWGTasyBlQya6hKb kt7VMxfbCottKu2Fl7g7y2W+6ezzub+taGnNCpMH/QnFZxg84///pZmIIy9E8GQbRI1d CoWw== X-Gm-Message-State: AOAM531TQFvkVIbru6kfRP+v9lcT6XdHwuhggUmrkacyjGqWvst80oQw HHP4It41T3bTu15dGInlVGkA/21s4hwsRA== X-Google-Smtp-Source: ABdhPJynvP8CTGDb3GleJmpT4mzYgbE2ZTvNMlW3bxGa7++wHvbH6ti2WxGPM8epuvBl8KHinyIC+w== X-Received: by 2002:aa7:d718:: with SMTP id t24mr5763185edq.259.1621327301482; Tue, 18 May 2021 01:41:41 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d7sm9851917ejk.55.2021.05.18.01.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 01:41:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/3] cirrus-ci: test installation Date: Tue, 18 May 2021 10:41:37 +0200 Message-Id: <20210518084139.97957-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518084139.97957-1-pbonzini@redhat.com> References: <20210518084139.97957-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Entitlements are applied via an install script that runs at installation time. Test it in CI. Signed-off-by: Paolo Bonzini --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f4bf49b704..340fd395c0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,6 +37,7 @@ macos_task: - gmake check-qapi-schema V=1 - gmake check-softfloat V=1 - gmake check-qtest-x86_64 V=1 + - gmake install DESTDIR=$PWD/destdir macos_xcode_task: osx_instance: @@ -47,7 +48,7 @@ macos_xcode_task: script: - mkdir build - cd build - - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules + - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules --disable-strip --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake check-unit V=1 @@ -55,6 +56,7 @@ macos_xcode_task: - gmake check-qapi-schema V=1 - gmake check-softfloat V=1 - gmake check-qtest-x86_64 V=1 + - gmake install DESTDIR=$PWD/destdir windows_msys2_task: timeout_in: 90m From patchwork Tue May 18 08:41:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1480089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KVq0lmxH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FkqN918fDz9sRN for ; Tue, 18 May 2021 18:46:01 +1000 (AEST) Received: from localhost ([::1]:36584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1livMV-0007gN-3N for incoming@patchwork.ozlabs.org; Tue, 18 May 2021 04:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1livIP-0007eo-EG for qemu-devel@nongnu.org; Tue, 18 May 2021 04:41:45 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:36565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1livIN-0005Zm-IN for qemu-devel@nongnu.org; Tue, 18 May 2021 04:41:45 -0400 Received: by mail-ed1-x534.google.com with SMTP id df21so10110340edb.3 for ; Tue, 18 May 2021 01:41:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2HyLcj1YtK5IYUxge5C+XbulYhgKF2hWTVH09HPhIs0=; b=KVq0lmxHsStTDbXNaGMFd88dyevtEWOQVB1j0Zp9ETjWxzPtOZVhtBfCgdLXlepA6c q9uMG/cGIjtcqJvoJeXiseP829Rte63xjYDgkPtMRRHbJ1Sk2BTXC7KdkDyML2eRiQoR AtMrGgourVfNf7AgHEW0IbT0BmQWwiiIEd8JOvkPXctA1e9PJ40BvjbQtOhotffwcoN6 xRjRTl+fJYPKWNWgEknIz8OnlkSDZwOg5ZBe60ThOJlHa7hLSNHP2BDgO5c01K8zwr1u vQy43nBAMhENYQijCkk3ff7AxQ9onxtp89NMyjsYGdWlLxIkiajwOjQa83RU6Oxc3yLG hJ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2HyLcj1YtK5IYUxge5C+XbulYhgKF2hWTVH09HPhIs0=; b=iolBzkyQK1qPAyc8DRo0m/7tTwgS1tU8OOZKDULzu/QGqPgk6wQ6CH9tdyKI+ORofO CCoPiYCGj1spyMs3/agTINyrxUBabZa5PXLJfxlzpe0bBOrr0GpkHfT6gOY6vvtRmsj6 OsYz6We+wTLt7YnllMWqTdnu8dGWRQ60E6/aLJw7vxCTN6r5BJsOWdvz/0sGauhIP87M sLB085O0lnlMfXCHM3+vKijkKrtQXc+sgz7FFkoYs2bRqCMZfAMcFF6P4np6ZvDJ68lA lBVTKBNp44R49WA0C+tPBRe4v2KORYrJIDLaBZOesQ2/ort5B3sO6nA8A3xPLb3RAYEo 9oTg== X-Gm-Message-State: AOAM533jOOkAZ6fwZ67F3qECYBV/vq4u0t9RCPb1n/WLwzgYZHRzfD4e NmzcN7G+xUaq5wfp7kRhxAxSSkHBaBSDUg== X-Google-Smtp-Source: ABdhPJzmgLnSnA5H7TKnD/KLw53ZC32K5WTE+bSd8hywEXwl3FdKhR/2uXcWF8RdGnNoncWkpRaTPQ== X-Received: by 2002:a05:6402:1158:: with SMTP id g24mr5663365edw.134.1621327302149; Tue, 18 May 2021 01:41:42 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d7sm9851917ejk.55.2021.05.18.01.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 01:41:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/3] ci: do not use #processors+1 jobs, #processors is enough Date: Tue, 18 May 2021 10:41:38 +0200 Message-Id: <20210518084139.97957-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518084139.97957-1-pbonzini@redhat.com> References: <20210518084139.97957-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" I could not reconstruct the origin of the $(($(nproc) + 1)) idiom, but I suspect it was there only to have a sensible result when nproc or getconf do not exist. This can be achieved also with an "||". Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bd1a91aa8..3f0d86cf0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ include: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: - - JOBS=$(expr $(nproc) + 1) + - JOBS=$(nproc || echo 1) script: - if test -n "$LD_JOBS"; then From patchwork Tue May 18 08:41:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1480093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mhxgj2Xn; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FkqRx4r6Sz9sRf for ; Tue, 18 May 2021 18:49:17 +1000 (AEST) Received: from localhost ([::1]:44764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1livPf-0004qX-Mm for incoming@patchwork.ozlabs.org; Tue, 18 May 2021 04:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1livIQ-0007hs-2d for qemu-devel@nongnu.org; Tue, 18 May 2021 04:41:46 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:35551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1livIO-0005Zv-4e for qemu-devel@nongnu.org; Tue, 18 May 2021 04:41:45 -0400 Received: by mail-ed1-x52c.google.com with SMTP id di13so10112698edb.2 for ; Tue, 18 May 2021 01:41:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B+UfyAyUGiAiWnXT7MW23ziiefpESfd+gUg+NeuudDA=; b=mhxgj2Xn8bCbWNuzh3R4tMTSTTEksfjjifbAmvhv1tx9/RvStmNiJClumsWbRhZyFu MP+/HevnP7DvtOmNb2kRBVzQPlXV53l8SUmC9RxQgqWnINYVn/YuUnTxNRjHiT+VAL9A g3Tp4oC4oYPOuff9+qU/ZET/1KtWpdLrAeaGJLizo5nIHs13esVZjTBhk0NQfCNL+v7i p6/BtXjQQu2s7cN03agKUaSNtliFLmYKudUrGOE2dnj73pt0KXbNX4pp3QW6rEZH60AK RILTdn6VDL6SJU9SNMzMlqC4wci2EAWe6/AWqcCUgyAoeJ9AhBtaQFPr8XWH+/sCO9yQ Dozw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=B+UfyAyUGiAiWnXT7MW23ziiefpESfd+gUg+NeuudDA=; b=Idex/85y28VNKXs6+93sDhKGzQvcD9JJyZXbT0MECT4PnTsXU2gPSNKf/FanmZ6ind +VOglhQodoMuX/8If4x8uj+STDDOZcEz+tHYei+j2Z6Yct6I3jIsgMzvIH92+a3t9160 YPQttTu7qt5PKYCOYQG6jI0QczGnMijjYg4sRr/lHjXdFGIPOs5TzSv+XK0PUer9QxZm ve32ijFIKJmCHNHATlnf8xQ2Zh9SVZv/YBbIqe0B2dGC5iYqghrfgTGqHB03hCwE8EZE wv7XRfSE1pJcEdxFR/Ohma7vJRYbmGvO3VH6uKYuFsJMbl7k97vHVvJfjoL33oYjXI0W OUAQ== X-Gm-Message-State: AOAM53124AC50UFv1tRKxgMjoU0W3HwvYk4qXKQHKgTUu7G5PqGgfgle yDnQBYEMx2zZM+YdJ0HdXmQbPVNyLKKiDQ== X-Google-Smtp-Source: ABdhPJxS/bhWlTuZMoNWXPSLsMqDvM9wc7fisD+leMe2irjcnjCk8yXB2oUaoNp8dFGaVjLumSYtpQ== X-Received: by 2002:a05:6402:652:: with SMTP id u18mr5689688edx.388.1621327302786; Tue, 18 May 2021 01:41:42 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d7sm9851917ejk.55.2021.05.18.01.41.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 01:41:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] ci: add -j to all "make" jobs Date: Tue, 18 May 2021 10:41:39 +0200 Message-Id: <20210518084139.97957-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518084139.97957-1-pbonzini@redhat.com> References: <20210518084139.97957-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Run the tests in parallel, as that can greatly speed up the jobs. "meson test" is able to report failures to the terminal in a way that is readable enough even when tests are run in parallel. Signed-off-by: Paolo Bonzini --- .cirrus.yml | 18 +++++++++--------- .gitlab-ci.yml | 8 ++++---- .travis.yml | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 340fd395c0..fcf0f34a4c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,11 +32,11 @@ macos_task: --extra-cflags='-Wno-error=deprecated-declarations' || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - - gmake check-unit V=1 + - gmake -j$(sysctl -n hw.ncpu) check-unit V=1 - gmake check-block V=1 - - gmake check-qapi-schema V=1 - - gmake check-softfloat V=1 - - gmake check-qtest-x86_64 V=1 + - gmake -j$(sysctl -n hw.ncpu) check-qapi-schema V=1 + - gmake -j$(sysctl -n hw.ncpu) check-softfloat V=1 + - gmake -j$(sysctl -n hw.ncpu) check-qtest-x86_64 V=1 - gmake install DESTDIR=$PWD/destdir macos_xcode_task: @@ -51,11 +51,11 @@ macos_xcode_task: - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules --disable-strip --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - - gmake check-unit V=1 + - gmake -j$(sysctl -n hw.ncpu) check-unit V=1 - gmake check-block V=1 - - gmake check-qapi-schema V=1 - - gmake check-softfloat V=1 - - gmake check-qtest-x86_64 V=1 + - gmake -j$(sysctl -n hw.ncpu) check-qapi-schema V=1 + - gmake -j$(sysctl -n hw.ncpu) check-softfloat V=1 + - gmake -j$(sysctl -n hw.ncpu) check-qtest-x86_64 V=1 - gmake install DESTDIR=$PWD/destdir windows_msys2_task: @@ -163,5 +163,5 @@ windows_msys2_task: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" - exit $LastExitCode test_script: - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j4 V=1 check" - exit $LastExitCode diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f0d86cf0a..4c0cc47c25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ include: - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=":" - - make NINJA=":" $MAKE_CHECK_ARGS + - make -j"$JOBS" NINJA=":" $MAKE_CHECK_ARGS .meson_test_template: &meson_test_definition artifacts: @@ -402,8 +402,8 @@ build-tcg-disabled: - ../configure --disable-tcg --audio-drv-list="" --with-coroutine=ucontext || { cat config.log meson-logs/meson-log.txt && exit 1; } - make -j"$JOBS" - - make check-unit - - make check-qapi-schema + - make check-unit -j"$JOBS" + - make check-qapi-schema -j"$JOBS" - cd tests/qemu-iotests/ - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 @@ -689,7 +689,7 @@ build-oss-fuzz: "${fuzzer}" -runs=1 -seed=1 || exit 1 ; done # Unrelated to fuzzer: run some tests with -fsanitize=address - - cd build-oss-fuzz && make check-qtest-i386 check-unit MTESTARGS="-t 2" + - cd build-oss-fuzz && make check-qtest-i386 check-unit -j"$JOBS" MTESTARGS="-t 2" build-tci: extends: .native_build_job_template diff --git a/.travis.yml b/.travis.yml index 4609240b5a..42e8f0b348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ env: - BUILD_DIR="build" - BASE_CONFIG="--disable-docs --disable-tools" - TEST_BUILD_CMD="" - - TEST_CMD="make check V=1" + - TEST_CMD="make check -j${JOBS} V=1" # This is broadly a list of "mainline" softmmu targets which have support across the major distros - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime" @@ -151,7 +151,7 @@ jobs: # Tests dependencies - genisoimage env: - - TEST_CMD="make check check-tcg V=1" + - TEST_CMD="make check check-tcg -j${JOBS} V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS} --cxx=/bin/false" - UNRELIABLE=true @@ -185,7 +185,7 @@ jobs: # Tests dependencies - genisoimage env: - - TEST_CMD="make check check-tcg V=1" + - TEST_CMD="make check check-tcg -j${JOBS} V=1" - CONFIG="--disable-containers --target-list=ppc64-softmmu,ppc64le-linux-user" - name: "[s390x] GCC check-tcg" @@ -218,7 +218,7 @@ jobs: # Tests dependencies - genisoimage env: - - TEST_CMD="make check check-tcg V=1" + - TEST_CMD="make check check-tcg -j${JOBS} V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" - UNRELIABLE=true script: @@ -301,7 +301,7 @@ jobs: - libvte-2.91-dev - ninja-build env: - - TEST_CMD="make check-unit" + - TEST_CMD="make check-unit -j${JOBS}" - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools --host-cc=clang --cxx=clang++" - UNRELIABLE=true