From patchwork Tue Aug 23 15:25:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599462 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp2524821mae; Tue, 23 Aug 2022 08:27:09 -0700 (PDT) X-Google-Smtp-Source: AA6agR59cnMfZvDjwDFpb1i/pc2RxhQ7LJ3NyRa4oRPvh43xcy9RurjqCSLfZv7JhiBrN5S77CD1 X-Received: by 2002:a05:620a:444b:b0:6bb:238a:2454 with SMTP id w11-20020a05620a444b00b006bb238a2454mr16365556qkp.183.1661268429545; Tue, 23 Aug 2022 08:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661268429; cv=none; d=google.com; s=arc-20160816; b=EiKE+/yOv1G4F1GRl3Qmv28MvO3KydaInM0HUg9dEo5bFdJsnAAEsTaf6ZoxXGr/Kw i7kv2t24DplvhzATUIaSzBw33tF84wAKPhSg0dQl8a/mpXAmzWbCA/APbjp+zzPDLZv9 gu38q90wqpKETp4i/09KLA/mnN493Vui25xAgtEuSoSKvfj1XfljI0IJUylIGMW0tacz 7ZLG7al4ck1XvHg5HDjP51LEGTf/yGLq7LPviXO3h9i5/DDEllOmiWD7bMHQHum3LSD6 KjU9jV8FQJ5tsugBmOXr6bikimZXy1pgvjN70aYFA35Qem8fi4hNDXbgahq0rQsfy3Ub p/4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=txbwSCFAF7nR6j5gec2vODGDsH6fbUsPSo0QWL6oB90=; b=eoZ7xlEvUuHAdjuv1OcJVzE67lIAnFZcgXYxm5j+m8NFX/9kD+yIXkS99VWpXhhpCv VHtd8dDEz6QWHkMvIqBMDYONhCrlcMVGmHNC+Kgs7DUkYPM7S/Ol3aSu3I2A36HWoD3F lF0UZgGfWXXaNlG2hfaVHP4LoyXSo1PTY41DGScW49qG1yzmvHv8QWiKTv+2CGsFP4uB Z3M90upkVwACQiY+9+jmqQkZzQF91tDucqDXlaDraC9ORSeZVpxFfM+00BkQr8qD0HGQ jvpblTnYy9ZfexKCZ/I+4y++uz4S8zjm36GlG35luqNN0rBy90nX3rA7L58qyvT9pd+d Enxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GjiN85M+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id kj24-20020a056214529800b00496e3810e51si3086099qvb.34.2022.08.23.08.27.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Aug 2022 08:27:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GjiN85M+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVo5-00022A-4J for patch@linaro.org; Tue, 23 Aug 2022 11:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn4-0001yr-Ma for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:06 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn3-0000Rs-1w for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:06 -0400 Received: by mail-wr1-x434.google.com with SMTP id n7so17432616wrv.4 for ; Tue, 23 Aug 2022 08:26:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=txbwSCFAF7nR6j5gec2vODGDsH6fbUsPSo0QWL6oB90=; b=GjiN85M+OumKDYa8A9nuh8zv1p39tOEtL67OrILic8bCmfFGNdxGjBrZIrmP71vtVx b+T6G9OOPDwo/LB89O10zjTzomZIvEC+yyfIGeKPqZCm52L1kA7kbOc7i8DwzZ6nVTVp uV0ZMPNgReFxnoU8cIYtPn61LLWEiDctsK5cNCyu7Bw28CAJccUtZpaekRIw0HlRCK8V CxoLlkVnv1WXpWSX/cUjwOgFA1L5DWCfPK/LzYI8NbnjQo3K5WmGquJKnoNuvysiOcdI CVQ9vqIbuB6Wmcsj7VH1kRlusbhVrZe7lbwgywxuiGAGsSJAOxIBiXcPzrpZd2d1ZPwR uIpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=txbwSCFAF7nR6j5gec2vODGDsH6fbUsPSo0QWL6oB90=; b=035rZhgfkXQ5FY6TmKG0fJ3MAaSKoUKjMlf/jgizaNzcEXq5Nd6FAYhp6gRJ2cnlxr uM+PB/XFpdhtzq04fWCAmoXFNmH3PMaxeDN31HMszwi/4mGXB9JZcYD/w0Jd3ckJCqv1 TLiuwqoq5c1d4XXuhlcYXo+UJCO6EjtPuND2uJPm0zvG1zMgjYo3L7s9pnIekJUoLDqF mEG39YudmtWYoFQiUNqpMea4r7iWz+6HhW/fdmG1vx7rbFZjp3YqOpn0P9If5kC/TB9g OX5kJAvuJM8hEkI+y9q6izEOKimRxBelUHPjGlvRlt2j4gJSh5Uor7bfemIGQSdmgaqQ Vq1Q== X-Gm-Message-State: ACgBeo35vA/tRN/33nsBiD7n/CxurFBgvqGsC+eFV5C6v4idMj6sq7Cu DPQHE4cus8jSI8cy2oBp9TRzig== X-Received: by 2002:a05:6000:242:b0:225:30e0:ced4 with SMTP id m2-20020a056000024200b0022530e0ced4mr13633409wrz.114.1661268360422; Tue, 23 Aug 2022 08:26:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d24-20020adfa358000000b0021ea1bcc300sm15025213wrb.56.2022.08.23.08.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:25:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A28781FFBA; Tue, 23 Aug 2022 16:25:58 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , "Dr . David Alan Gilbert" , =?utf-8?q?Alex_Benn=C3=A9e?= , Juan Quintela , Laurent Vivier , Paolo Bonzini Subject: [PULL 2/6] tests/qtest/migration-test: Only wait for serial output where migration succeeds Date: Tue, 23 Aug 2022 16:25:54 +0100 Message-Id: <20220823152558.301624-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Waiting for the serial output can take a couple of seconds - and since we're doing a lot of migration tests, this time easily sums up to multiple minutes. But if a test is supposed to fail, it does not make much sense to wait for the source to be in the right state first, so we can skip the waiting here. This way we can speed up all tests where the migration is supposed to fail. In the gitlab-CI gprov-gcov test, each of the migration-tests now run two minutes faster! Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Thomas Huth Message-Id: <20220819053802.296584-2-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Juan Quintela Message-Id: <20220822165608.2980552-3-alex.bennee@linaro.org> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 520a5f917c..7be321b62d 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1307,7 +1307,9 @@ static void test_precopy_common(MigrateCommon *args) } /* Wait for the first serial output from the source */ - wait_for_serial("src_serial"); + if (args->result == MIG_TEST_SUCCEED) { + wait_for_serial("src_serial"); + } if (!args->connect_uri) { g_autofree char *local_connect_uri =