From patchwork Fri Dec 8 10:15:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35938 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 678CDC4167B for ; Fri, 8 Dec 2023 10:15:32 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.17058.1702030529325565299 for ; Fri, 08 Dec 2023 02:15:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BgH8XoB2; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40c09d62b70so22396025e9.1 for ; Fri, 08 Dec 2023 02:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702030528; x=1702635328; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6DnBnPKsa65szyhujGlcDCXSATwp4DF8RSjxWKzs7tI=; b=BgH8XoB2vccUpvMyNKBQvWMggvwJGL7wSA0e4Kg33leuFTYF9bT9ENuUaPFUbtmFEp AVIuAqkmIdHkWgs7OqF0iD7MeNZBDPyx2Sp5bEL85yhfvc83Y6ZFjVDAX1kzIZna1fAF M3293L4cbGVlviJ3QINq/OV82AnFQ5l6WFNGNldgagJmAHdw52MtTDZblxVi47srd8L4 DI3mnDQP9TAa0BBnMv9z9uw9KYqWGnG2+YpupqVD2XhHAO0dLfK/8VHkA5uQUanTrVVK IniXmixp0EWB8V1xL2Dp5Tgs9HJQdArg5su28s8UCtFOVA7wDWyohY9MxKlDo/GpwnNP jYRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702030528; x=1702635328; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6DnBnPKsa65szyhujGlcDCXSATwp4DF8RSjxWKzs7tI=; b=td4Ev1wHlFzfyuMMAJGzM5M2RFcvFzgz5taWJwf9HpeC2nV6Exxb1r3b2gr8KrL8ce OJZWYS6enPg4sdv0GIlbseIcSJTiZeG1EzT3DYfK1XaMVF7L4RBpIcL1weGQhSkBUW2u tXUQlQIVeOoAoipPf9tk79zcSysoTVXIkl7jPz6+c383Eou0JilFHBFaS0BlnBF1hXs7 NcoP0T+INi7O3MDxtHGzoQoWb44YjUdIZIG6FjfZIfIxTnVxeqTVvs/U2DS9EUZJC6cA OPj+cwcY6CKiGYy3BswXmiiB53cWZxRgrwyZ9o3WT7QNzjsF8bJU43v3hVmcAR3L9/ev zMrQ== X-Gm-Message-State: AOJu0Yx8YdyHsmYg5Z1MWKvXo7zyX3uswGJNu4/xnE9xbv5F9eWxe7Or LOlmkFCPIQtRY+E4M+dudOeIhzVNoxY= X-Google-Smtp-Source: AGHT+IGNSqEfMiL8G+w1q7drAVcr8B78IkgrO3rovEEtbtc/uyHssn+275McPC8y5ktIFDjbwbYGfw== X-Received: by 2002:a05:600c:130e:b0:40b:5e21:c59c with SMTP id j14-20020a05600c130e00b0040b5e21c59cmr1642090wmf.106.1702030527418; Fri, 08 Dec 2023 02:15:27 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b16-20020a05600c4e1000b0040c310abc4bsm2746707wmq.43.2023.12.08.02.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:15:27 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/6] selftest/sstatetest: print output from bitbake with actual newlines, not \n Date: Fri, 8 Dec 2023 11:15:17 +0100 Message-Id: <20231208101522.198832-1-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Dec 2023 10:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192028 Assert*() functions from python unittest would join the multiline output with \n, making it almost unreadable. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/sstatetests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 7c2b14e95f6..79001854501 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -798,9 +798,9 @@ TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2" self.delete_recipeinc(change_recipe) for item in expected_sametmp_output: - self.assertIn(item, result_sametmp.output) + self.assertIn(item, result_sametmp.output, msg = "Item {} not found in output:\n{}".format(item, result_sametmp.output)) for item in expected_difftmp_output: - self.assertIn(item, result_difftmp.output) + self.assertIn(item, result_difftmp.output, msg = "Item {} not found in output:\n{}".format(item, result_difftmp.output)) def run_test_printdiff_changeconfig(self, target, change_content, expected_sametmp_output, expected_difftmp_output): self.write_config(""" @@ -820,9 +820,9 @@ TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2" result_difftmp = bitbake("-S printdiff {}".format(target)) for item in expected_sametmp_output: - self.assertIn(item, result_sametmp.output) + self.assertIn(item, result_sametmp.output, msg = "Item {} not found in output:\n{}".format(item, result_sametmp.output)) for item in expected_difftmp_output: - self.assertIn(item, result_difftmp.output) + self.assertIn(item, result_difftmp.output, msg = "Item {} not found in output:\n{}".format(item, result_difftmp.output)) # Check if printdiff walks the full dependency chain from the image target to where the change is in a specific recipe From patchwork Fri Dec 8 10:15:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 686E3C46CA3 for ; Fri, 8 Dec 2023 10:15:32 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.17060.1702030529908686140 for ; Fri, 08 Dec 2023 02:15:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hrGNZ25t; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40c2308faedso19726215e9.1 for ; Fri, 08 Dec 2023 02:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702030528; x=1702635328; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ouPqT8stXnd/8PZJ4mPjocEERjQu7mN7hq+NnHCnA40=; b=hrGNZ25tCJ05uXkICi34N0EGFsjvAeh7g7KPn0a/4mc8S8s3PDLCGHaMCgPS0//l+n kDe/Jbj1H60mp56knjnIP/hOOwfmdd6K4EmPntEqtUXo8YH60Rmo8AyVTKXQzsUL2o0q YdP+mCxcr16216FF4GiXK7uHyUzucNPfxWcEhS36BV8phG/tluMmju4wfVr1snJuxyUa CgJauFXsIMyH8oDi1Jk4P1fkCOYUywKjrTYA9At2dhrFxXC5q8+Ik6y1y5WZBygjFnCK u2uM9OhJOrNKJXG54kgay2DRk1JURSmln7vXlL8oraXT7Rw7GnnWntEsf3RwKdJdDvmT AHqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702030528; x=1702635328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ouPqT8stXnd/8PZJ4mPjocEERjQu7mN7hq+NnHCnA40=; b=WrpsZjLLWBcHN8tR8KDz5SHINXFAiZCb+QBL0ecCSpGv4C3XiBW4yLxoD6YD0x46Bs ja5sqZA+OEqPKfuBVO7DB0ZOJ9K9v+i8+qGnqaSVsYXt2XwT1qRwNdgcTh9I73AODnxH MbyelnFeJzK7cxrYhu97Oqzp8sEyGQNm7k45cRUX2h/9GbE6Q4iXBTTlBzlGEByAh0bh jgPVV+Eeu/gcy3jHLIabTJzF+ViABTYfxTykn+6LACdhFw+u3St1V4lIm2jVBGtjWxo0 abTmCcA89sXtyqeQYNGwdEsU0KzD4ITV9ETNhW2bGjvvfKoVuFVnyOyCzmcPL1tQdiPm NOmA== X-Gm-Message-State: AOJu0Ywz4ApEJt40pq06SHkj4uL4qlZtBnTxpXW99AmYORAAjGoqN9Df iiUJ0/bL10M9CxYUuG+JtNb/3L5KiXA= X-Google-Smtp-Source: AGHT+IH+9bEAL+DKGved3pX7cGyeVQOHmj7MyewHYH/K9cj1TbjyWGj8R3LV4syt2fCssF0z9hfzKA== X-Received: by 2002:a05:600c:220a:b0:40b:5e59:c557 with SMTP id z10-20020a05600c220a00b0040b5e59c557mr2191957wml.129.1702030527898; Fri, 08 Dec 2023 02:15:27 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b16-20020a05600c4e1000b0040c310abc4bsm2746707wmq.43.2023.12.08.02.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:15:27 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/6] selftest/sstatetests: do not delete custom $TMPDIRs under build-st when testing printdiff Date: Fri, 8 Dec 2023 11:15:18 +0100 Message-Id: <20231208101522.198832-2-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208101522.198832-1-alex@linutronix.de> References: <20231208101522.198832-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Dec 2023 10:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192029 If the tests fail, these contain useful artefacts, and so should be kept. If the test succeeds the whole build-st/ is deleted. Also, give them unique names, as otherwise the tests would step on each other. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/sstatetests.py | 22 ++++++++++----------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 79001854501..795cd5bd85f 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -777,10 +777,10 @@ addtask tmptask2 before do_tmptask1 class SStatePrintdiff(SStateBase): def run_test_printdiff_changerecipe(self, target, change_recipe, change_bbtask, change_content, expected_sametmp_output, expected_difftmp_output): + import time self.write_config(""" -TMPDIR = "${TOPDIR}/tmp-sstateprintdiff" -""") - self.track_for_cleanup(self.topdir + "/tmp-sstateprintdiff") +TMPDIR = "${{TOPDIR}}/tmp-sstateprintdiff-sametmp-{}" +""".format(time.time())) # Use runall do_build to ensure any indirect sstate is created, e.g. tzcode-native on both x86 and # aarch64 hosts since only allarch target recipes depend upon it and it may not be built otherwise. # A bitbake -c cleansstate tzcode-native would cause some of these tests to error for example. @@ -791,9 +791,8 @@ TMPDIR = "${TOPDIR}/tmp-sstateprintdiff" result_sametmp = bitbake("-S printdiff {}".format(target)) self.write_config(""" -TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2" -""") - self.track_for_cleanup(self.topdir + "/tmp-sstateprintdiff-2") +TMPDIR = "${{TOPDIR}}/tmp-sstateprintdiff-difftmp-{}" +""".format(time.time())) result_difftmp = bitbake("-S printdiff {}".format(target)) self.delete_recipeinc(change_recipe) @@ -803,20 +802,19 @@ TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2" self.assertIn(item, result_difftmp.output, msg = "Item {} not found in output:\n{}".format(item, result_difftmp.output)) def run_test_printdiff_changeconfig(self, target, change_content, expected_sametmp_output, expected_difftmp_output): + import time self.write_config(""" -TMPDIR = "${TOPDIR}/tmp-sstateprintdiff" -""") - self.track_for_cleanup(self.topdir + "/tmp-sstateprintdiff") +TMPDIR = "${{TOPDIR}}/tmp-sstateprintdiff-sametmp-{}" +""".format(time.time())) bitbake("--runall build --runall deploy_source_date_epoch {}".format(target)) bitbake("-S none {}".format(target)) self.append_config(change_content) result_sametmp = bitbake("-S printdiff {}".format(target)) self.write_config(""" -TMPDIR = "${TOPDIR}/tmp-sstateprintdiff-2" -""") +TMPDIR = "${{TOPDIR}}/tmp-sstateprintdiff-difftmp-{}" +""".format(time.time())) self.append_config(change_content) - self.track_for_cleanup(self.topdir + "/tmp-sstateprintdiff-2") result_difftmp = bitbake("-S printdiff {}".format(target)) for item in expected_sametmp_output: From patchwork Fri Dec 8 10:15:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A7EEC10DC1 for ; Fri, 8 Dec 2023 10:15:32 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.17182.1702030530128216317 for ; Fri, 08 Dec 2023 02:15:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fa5DoLvW; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40c2d50bfbfso6688155e9.0 for ; Fri, 08 Dec 2023 02:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702030528; x=1702635328; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z6bciA5/pYIvnnCvGHiH4xqsitz04m8Lld8j+9HBQ3s=; b=Fa5DoLvWz2E9MBozSEWlSD9ACTRA88Kyweoxcgwd3bVjdG2Vbr0+s6KemR0tVcYodH Va6cziH01au2f32rsHZ+CfFWGrxcQOCi185kYq+yZC+2lqFgNbWuYdYzCGDaHVXjj3pi /78DJl/vPCDH3Qb2ZO5kFqyctJ2A/499+glFyVPqGwu1dibn+4dmVI/VtR32z0KMjgoO TuPxH80weoi0WISx79FbRKsIIJFOct2tQmb9QvqCHtSeeXiWIoHlxDaScesI3lj8vt7z UaSykB5/UabQkiJzSEk/iWsUl2xYDy2ptoUxWHPbJn8rgDDTUig7j2qGdjjXCJbQjCOi kzwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702030528; x=1702635328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z6bciA5/pYIvnnCvGHiH4xqsitz04m8Lld8j+9HBQ3s=; b=T6AHSI3kc/XUDtl0PTUYPjsRIS6CBbdJ8RAQsPJypmm+Vsoc7rWKyToyib2d5R25yx IHB6XDEm8cLLs/j51ynxQvAKEJCLD/XPJn5JErLPAT7IX8Dlw4c2cEK2371QJwrICgvh VvISL800b6JIn43uT0ZdGc4b0ucRuv1Ku71CQL2GoUcVvBweAorBSjMWvdwWsGXzx1DU B4S8VjfgYasUAGt2hOnhnCvVJXPxAswUzsRZQOI2bfJa3TaDMGY6UXiYUSGGHJLx+Pr+ rx+GMuCTu0fVWiN/UOCWDZkjmdqXk5zlcW8pYu/jo09iDLjKXYI7mg35+9phmGME5x/a jPLw== X-Gm-Message-State: AOJu0YxkoiA5fsGwJdjiJZ1DYC7gWOybauYE2aTTakukcVDIiiEVkxew XXDShCfYhvbjY7JLHOl31bv8F5Uzf+I= X-Google-Smtp-Source: AGHT+IGKdWgNa+JG6CwIsjk1r7KTrA+e+BrcX99TTGplpF+uCBaK/phm0OzkzTLY9j+PqvIxc/IDFg== X-Received: by 2002:a05:600c:1c93:b0:40c:255a:5e17 with SMTP id k19-20020a05600c1c9300b0040c255a5e17mr318495wms.38.1702030528352; Fri, 08 Dec 2023 02:15:28 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b16-20020a05600c4e1000b0040c310abc4bsm2746707wmq.43.2023.12.08.02.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:15:28 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/6] sstatesig/find_siginfo: special-case gcc-source when looking in sstate caches Date: Fri, 8 Dec 2023 11:15:19 +0100 Message-Id: <20231208101522.198832-3-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208101522.198832-1-alex@linutronix.de> References: <20231208101522.198832-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Dec 2023 10:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192030 This is already done for local stamps just above, and will allow enabling the full selftest that compares gcc-source signatures via printdiff (that is, both local stamp and sstate variants). Signed-off-by: Alexander Kanavin --- meta/lib/oe/sstatesig.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index e250f51c124..8a97fb0c04b 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -398,6 +398,9 @@ def find_siginfo(pn, taskname, taskhashlist, d): localdata.setVar('TARGET_VENDOR', '*') localdata.setVar('TARGET_OS', '*') localdata.setVar('PN', pn) + # gcc-source is a special case, same as with local stamps above + if pn.startswith("gcc-source"): + localdata.setVar('PN', "gcc") localdata.setVar('PV', '*') localdata.setVar('PR', '*') localdata.setVar('BB_TASKHASH', hashval) From patchwork Fri Dec 8 10:15:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35940 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83119C46CC5 for ; Fri, 8 Dec 2023 10:15:32 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.17062.1702030530654850610 for ; Fri, 08 Dec 2023 02:15:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XVHkLO6D; spf=pass (domain: gmail.com, ip: 209.85.128.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-40c09f4814eso25545355e9.1 for ; Fri, 08 Dec 2023 02:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702030529; x=1702635329; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WwMmJq+BWUg+eqoxdQ+B4BP01uLc9pERMwKRbjyZ0QI=; b=XVHkLO6DR4alTeTQKrrpdqXISRwr//b3AlZpYNgr6N6Jgo1HNyZFgHDdGqMdKR9dcM L0Bn/FheXKtcsgTuqhS6vw2NafEII8CQ6W/pldmkBNj5CUQkoKuLfy4HdgmhUMZcx9sc zilnbsG2Jcy49vX4YtjPXVGmJdW/5DYPcfIB1CXAjajEVoU/di6VlbHqM4HxR00KQ8gQ KDy6nMbJJ9BoRuEWig6kfiM5J0baeJe+9xaHdYGNkTZas+q26X29QbcaY7dWdk6tcZXY /vwQKIqcVm4uKDw0UM25DAgCln8QEeFUXlC7lQioSItre2b4LT1RGXoY4V8Qh1tDsJXN pgrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702030529; x=1702635329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WwMmJq+BWUg+eqoxdQ+B4BP01uLc9pERMwKRbjyZ0QI=; b=istazMXZbj9MlMCWJ3QVsmkxghGd8LPCTLpV81/6zIaBhCZUUWuiSCw7OhLQMIIfLo ODsa3HiIdd92ytYVf6G5KQzANFA5/FslMtPuR9j2YniOpTwpmvYiNUD9F4dOYZWDZUt+ lOwc4+dFzpuh6Zuu9b68gTDUuZ/IfqrjUbLU2DQmuhgMa2rdYEAO5tM43CTEj9lRAjKi lBV2viWNTnjTAhrrjEMTHAkr67BaywpT4kPq11RdWT1tg9Vjx3jXaeNHD0uHrcSjqeF/ 2JpUApPEFi/wAlMrVYKyBMm7mQpciq55WGUVEyb39enZc9ek1zFSnt830SOLnmLWSceD I0Pg== X-Gm-Message-State: AOJu0YxzCYPXxObBIhWsdi8NR3pIA1aDn5lxSSfxe5Tg6fi2DjjK6Cp3 OugohF5G8VQw8fDo9Qfd5o5LGD0NdLI= X-Google-Smtp-Source: AGHT+IER9/UbFvlRL5I01ntDP9TdVE6zq5X+TuRvo5T53F/NH6CRrFGpdvU5dhsZMa8U412QfkFgxg== X-Received: by 2002:a05:600c:2946:b0:40c:2572:2017 with SMTP id n6-20020a05600c294600b0040c25722017mr1961749wmd.159.1702030528827; Fri, 08 Dec 2023 02:15:28 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b16-20020a05600c4e1000b0040c310abc4bsm2746707wmq.43.2023.12.08.02.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:15:28 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/6] gnu-config: add a do_compile task Date: Fri, 8 Dec 2023 11:15:20 +0100 Message-Id: <20231208101522.198832-4-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208101522.198832-1-alex@linutronix.de> References: <20231208101522.198832-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Dec 2023 10:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192031 noexec flag has an unfortunate side effect of not writing out the .siginfo file into sstate (because that is done in sstate bbclass from a task-completed event handler). In the absence of the siginfo file, diffsigs code is unable to trace back the change in task signatures if the change is really basic and affects tasks coming ahead of gnu-config-native:do_compile. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 718f798a00e..c72de159ce2 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -19,7 +19,8 @@ UPSTREAM_CHECK_COMMITS = "1" CLEANBROKEN = "1" -do_compile[noexec] = "1" +do_compile () { +} do_install () { install -d ${D}${datadir}/gnu-config \ From patchwork Fri Dec 8 10:15:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35939 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7625BC10DCE for ; Fri, 8 Dec 2023 10:15:32 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.17183.1702030531163914527 for ; Fri, 08 Dec 2023 02:15:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JzaylOde; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40c09dfd82aso25725375e9.0 for ; Fri, 08 Dec 2023 02:15:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702030529; x=1702635329; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+waqYYg7VWbzxV6xh4FVg3G93gSoP5P0Fg4TpcTCpVo=; b=JzaylOdeLkfr+aWVP2/xz4BGAyCwNtS6UBRZ1/ksUxpRz0h0S4VyFLn7OiaNEw0Vin f/4rTNkYidcXN8D4NyxXjub70fQdiSeyEdnaM1Lv8sD8fNRly+oQjY/Qmu0F44Np25yq c80CHIF19UMNeP5jMBcSVV0vs0S9k4j8UoRA7cLmSP2TW62kz0jwP6xWGE6lxGNPVQfD NW2cNziTm8m4UbGu+egpZo1hPpj4NVlctiP0WMon09xqQFpnqH9KTlqs0p506oTSjpH3 /59a+4gtZ4UKPizwymljtPXVihyGd8U+FWofQAcmwi/DGAScbosmtGRoWcD147Rq3Gv8 sQfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702030529; x=1702635329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+waqYYg7VWbzxV6xh4FVg3G93gSoP5P0Fg4TpcTCpVo=; b=DPyWmaCauDQjZKxlEjmi/mcObiC3x4qcTDCYURzZ0qKJ7xpGkZpLr2oNrEYeKm37V/ peFtmxWFQlYVGZkqPBvUl9+wbNwJqgmd7SLNAGt2FMqXlb3I8BxlI5EZVqccMO4LTJJk XSdlxW4bRzCa/j0lShXu+opI+vYRhp7/dZxyZgsPFfu+2F2dnsAoG8G6f7Q/JrdtzM6D VZIk7tg0+6JENUPv6u8nKvAMoFnjB0XwFIAo1wofUeZEjYtEkfjGuesHUqSZPRHANN6g kO5DF7R/Zb5zzbqCKOIRsqGs5+KhA3TxyudVrynqGHc3IXc4NTVGV6370+HD+cGy9GDk +a6g== X-Gm-Message-State: AOJu0YyCAZ2dOYWDb0VNOz6Wed+qvTdfnHeHEmJtXJ4yfC4wP4cxDWSs Wgc6FIjNEh6UTCtexoUKpS8Pokt73uE= X-Google-Smtp-Source: AGHT+IFL8emwP8feMGBzHMB9SlR3hDGWIjJ94EYMuFsxSkrPNaabMmOIJHweFAAm0T95VVHnEXQCxw== X-Received: by 2002:a05:600c:1e16:b0:40c:20f1:8f8c with SMTP id ay22-20020a05600c1e1600b0040c20f18f8cmr2528433wmb.112.1702030529300; Fri, 08 Dec 2023 02:15:29 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b16-20020a05600c4e1000b0040c310abc4bsm2746707wmq.43.2023.12.08.02.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:15:29 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/6] runqueue: rework 'bitbake -S printdiff' logic Date: Fri, 8 Dec 2023 11:15:21 +0100 Message-Id: <20231208101522.198832-5-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208101522.198832-1-alex@linutronix.de> References: <20231208101522.198832-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Dec 2023 10:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192032 Previously printdiff code would iterate over tasks that were reported as invalid or absent, trying to follow dependency chains that would reach the most basic invalid items in the tree. While this works in tightly controlled local builds, it can lead to bizarre reports against industrial-sized sstate caches, as the code would not consider whether the overall target can be fulfilled from valid sstate objects, and instead report missing sstate signature files that perhaps were never even created due to hash equivalency providing shortcuts in builds. This commit reworks the logic in two ways: - start the iteration over final targets rather than missing objects and stop at the first invalid object - if a given object can be fulfilled from sstate, do not recurse into its dependencies; bitbake wouldn't care if they're absent, and neither should printdiff This changes the console output significantly: where previously printdiff would report the most basic invalid tasks it could find, with this change the most top-level tasks are reported instead. This is not a problem as diffsigs has its own task recursion facility, and will track down the actual change anyway. This is reflected in fixing up the selftests. [YOCTO #15289] Signed-off-by: Alexander Kanavin --- bitbake/lib/bb/runqueue.py | 27 +++++----- .../perlcross_%.bbappend} | 0 meta/lib/oeqa/selftest/cases/sstatetests.py | 51 +++++++++++-------- 3 files changed, 43 insertions(+), 35 deletions(-) rename meta-selftest/recipes-test/{quilt-native/quilt-native_%.bbappend => perlcross/perlcross_%.bbappend} (100%) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 864708ee4a5..c9fe38615cf 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1717,35 +1717,32 @@ class RunQueue: valid_new.add(dep) invalidtasks = set() - for tid in self.rqdata.runtaskentries: - if tid not in valid_new and tid not in noexec: - invalidtasks.add(tid) - found = set() - processed = set() - for tid in invalidtasks: + toptasks = set(["{}:{}".format(t[3], t[2]) for t in self.rqdata.targets]) + for tid in toptasks: toprocess = set([tid]) while toprocess: next = set() for t in toprocess: + if t not in valid_new and t not in noexec: + invalidtasks.add(t) + continue + if t in self.rqdata.runq_setscene_tids: + continue + for dep in self.rqdata.runtaskentries[t].depends: - if dep in invalidtasks: - found.add(tid) - if dep not in processed: - processed.add(dep) - next.add(dep) + next.add(dep) + toprocess = next - if tid in found: - toprocess = set() tasklist = [] - for tid in invalidtasks.difference(found): + for tid in invalidtasks: tasklist.append(tid) if tasklist: bb.plain("The differences between the current build and any cached tasks start at the following tasks:\n" + "\n".join(tasklist)) - return invalidtasks.difference(found) + return invalidtasks def write_diffscenetasks(self, invalidtasks): diff --git a/meta-selftest/recipes-test/quilt-native/quilt-native_%.bbappend b/meta-selftest/recipes-test/perlcross/perlcross_%.bbappend similarity index 100% rename from meta-selftest/recipes-test/quilt-native/quilt-native_%.bbappend rename to meta-selftest/recipes-test/perlcross/perlcross_%.bbappend diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 795cd5bd85f..07e82d25c62 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -824,14 +824,22 @@ TMPDIR = "${{TOPDIR}}/tmp-sstateprintdiff-difftmp-{}" # Check if printdiff walks the full dependency chain from the image target to where the change is in a specific recipe - def test_image_minimal_vs_quilt(self): - expected_output = ("Task quilt-native:do_install couldn't be used from the cache because:", + def test_image_minimal_vs_perlcross(self): + expected_output = ("Task core-image-minimal:do_create_spdx couldn't be used from the cache because:", +"Task linux-yocto:do_deploy couldn't be used from the cache because:", +"Task core-image-minimal:do_create_runtime_spdx couldn't be used from the cache because:", +"Task core-image-minimal:do_populate_lic_deploy couldn't be used from the cache because:", +"Task run-postinsts:do_package_write_rpm couldn't be used from the cache because:", +"Task packagegroup-core-boot:do_package_write_rpm couldn't be used from the cache because:", "We need hash", "most recent matching task was") - expected_sametmp_output = expected_output + ("Variable do_install value changed",'+ echo "this changes the task signature"') + expected_sametmp_output = expected_output + ( +"Hash for task dependency perlcross-native:do_install changed from", +"Variable do_install value changed", +'+ echo "this changes the task signature"') expected_difftmp_output = expected_output - self.run_test_printdiff_changerecipe("core-image-minimal", "quilt-native", "-c do_install quilt-native", + self.run_test_printdiff_changerecipe("core-image-minimal", "perlcross", "-c do_install perlcross-native", """ do_install:append() { echo "this changes the task signature" @@ -843,13 +851,18 @@ expected_sametmp_output, expected_difftmp_output) def test_gcc_runtime_vs_gcc_source(self): gcc_source_pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV'] - expected_output = ("Task {}:do_preconfigure couldn't be used from the cache because:".format(gcc_source_pn), + expected_output = ("Task gcc-runtime:do_create_spdx couldn't be used from the cache because:", +"Task gcc-runtime:do_create_runtime_spdx couldn't be used from the cache because:", +"Task gcc-runtime:do_populate_sysroot couldn't be used from the cache because:", +"Task gcc-runtime:do_package_qa couldn't be used from the cache because:", +"Task gcc-runtime:do_packagedata couldn't be used from the cache because:", +"Task gcc-runtime:do_package_write_rpm couldn't be used from the cache because:", "We need hash", "most recent matching task was") - expected_sametmp_output = expected_output + ("Variable do_preconfigure value changed",'+ print("this changes the task signature")') - #FIXME: printdiff is supposed to find at least one preconfigure task signature in the sstate cache, but isn't able to - #expected_difftmp_output = expected_output - expected_difftmp_output = () + expected_sametmp_output = expected_output + ("Hash for task dependency {}:do_preconfigure changed from".format(gcc_source_pn), +"Variable do_preconfigure value changed", +'+ print("this changes the task signature")') + expected_difftmp_output = expected_output self.run_test_printdiff_changerecipe("gcc-runtime", "gcc-source", "-c do_preconfigure {}".format(gcc_source_pn), """ @@ -861,19 +874,17 @@ expected_sametmp_output, expected_difftmp_output) # Check if changing a really base task definiton is reported against multiple core recipes using it def test_image_minimal_vs_base_do_configure(self): - expected_output = ("Task zstd-native:do_configure couldn't be used from the cache because:", -"Task texinfo-dummy-native:do_configure couldn't be used from the cache because:", -"Task ldconfig-native:do_configure couldn't be used from the cache because:", -"Task gettext-minimal-native:do_configure couldn't be used from the cache because:", -"Task tzcode-native:do_configure couldn't be used from the cache because:", -"Task makedevs-native:do_configure couldn't be used from the cache because:", -"Task pigz-native:do_configure couldn't be used from the cache because:", -"Task update-rc.d-native:do_configure couldn't be used from the cache because:", -"Task unzip-native:do_configure couldn't be used from the cache because:", -"Task gnu-config-native:do_configure couldn't be used from the cache because:", + expected_output = ("Task core-image-minimal:do_create_spdx couldn't be used from the cache because:", +"Task linux-yocto:do_deploy couldn't be used from the cache because:", +"Task core-image-minimal:do_create_runtime_spdx couldn't be used from the cache because:", +"Task core-image-minimal:do_populate_lic_deploy couldn't be used from the cache because:", +"Task run-postinsts:do_package_write_rpm couldn't be used from the cache because:", +"Task packagegroup-core-boot:do_package_write_rpm couldn't be used from the cache because:", "We need hash", "most recent matching task was") - expected_sametmp_output = expected_output + ("Variable base_do_configure value changed",'+ echo "this changes base_do_configure() definiton "') + expected_sametmp_output = expected_output + ("Hash for task dependency gnu-config-native:do_configure changed from", +"Variable base_do_configure value changed", +'+ echo "this changes base_do_configure() definiton "') expected_difftmp_output = expected_output self.run_test_printdiff_changeconfig("core-image-minimal", From patchwork Fri Dec 8 10:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 35943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 907E5C10F05 for ; Fri, 8 Dec 2023 10:15:32 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web10.17184.1702030531672695527 for ; Fri, 08 Dec 2023 02:15:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dOPFev2P; spf=pass (domain: gmail.com, ip: 209.85.128.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-40c236624edso20166235e9.1 for ; Fri, 08 Dec 2023 02:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702030530; x=1702635330; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oJIW+94NEVtrivuuZeCZTyNeE6Plg7E7ozfJj+P4UHM=; b=dOPFev2PSvuKksLQ9k4JP77kSwWOceoc/kWPbWL8v8n/JV8NsSeNGfHKVEX1y4knzV pvkq++s63q7V+ZXa40vmeRG30kzBScusdR5wSMtaT10y05rUm8rYcJEiGGNc5JETv8IZ 5S5CVIHqRyj7f2vpZ1f0TE2qIzDVqqa51n6j+Siqh96AxPcZcqgQw9LNZCEj97rKjCi5 fjoU2ERGN50Ql0fmdeB9iuW1JOnPu91RB3BfEnikTDTovZFC947zsmIxiKZa6k6hcw8p TFq2xdu25+t4yEQRw3uo/xOEFPhlmlp0EHuIJJh0V+t9Z/QymaxQXr8DCaJ/9IjQyuef O0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702030530; x=1702635330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oJIW+94NEVtrivuuZeCZTyNeE6Plg7E7ozfJj+P4UHM=; b=LOFaK6jPHZTg1Q5Kv+bSqWzvz035/7dAkJuHfOAddVBAaCU1tPCJ+P1Z5h5pDL3WnM 4C+vEU2EK6nxSuKyZ/n+XmKSn0XkE9L80z6GhYM14PX7UXGuCb2+nLpx+jAi5lN1GqPy xfuxUsSZiT3QiFq6cKEaD3JnvdVdFsU3btkj9cm+xzONBc6lA7s3a0+APgshRGxs28bX PPNYXmaXDrt3cgW0fqIlL7fMKdBZ//6Y/lMLKlXoU70DM5CJupis5d388O93SkCDAXNV 6FKpjOUikUYgJNPL6RlpFdBXpMV8JSy2agIU5UJBIDQqsRn72VvTs8dQFUxH/tF6sl+M 396A== X-Gm-Message-State: AOJu0YzN3aCicVZJ7vIInzL7AUMBYimemDDkhH6+BCIBBbOLPWeMp9FW ltWRdA/xnUbnKAP0IZa8o3SjZdXylRk= X-Google-Smtp-Source: AGHT+IGG6Og7WKrQ/tiW/5F3beFwyai8QgOT+0BMOvp1vEr4syhBeB4QaJaSmnRmHAdoNjOY5oFkyQ== X-Received: by 2002:a7b:c396:0:b0:40c:24e1:b6bb with SMTP id s22-20020a7bc396000000b0040c24e1b6bbmr1878538wmj.128.1702030529967; Fri, 08 Dec 2023 02:15:29 -0800 (PST) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id b16-20020a05600c4e1000b0040c310abc4bsm2746707wmq.43.2023.12.08.02.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 02:15:29 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 6/6] oeqa/selftest/sstatetests: re-disable CDN tests Date: Fri, 8 Dec 2023 11:15:22 +0100 Message-Id: <20231208101522.198832-6-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208101522.198832-1-alex@linutronix.de> References: <20231208101522.198832-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 Dec 2023 10:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/192033 With the rework of printdiff, it is not longer useful for checking absence of sstate objects in a remote http cache, as it would only report the top level missing signatures, and leave the recursive investigation to diffsigs (which relies on ability to list cache files - not available over http). The CDN check will be performed via a separate 'printmissing' function, which would be written specifically for the purpose, and so until then disable the test as it would only persistently fail. Signed-off-by: Alexander Kanavin --- meta/lib/oeqa/selftest/cases/sstatetests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 07e82d25c62..97ac0d2e9d9 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -930,12 +930,12 @@ SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downl result = bitbake("-D -S printdiff {}".format(targets)) self.check_bb_output(result.output, exceptions) - def test_cdn_mirror_qemux86_64(self): + def _test_cdn_mirror_qemux86_64(self): # Example: # exceptions = [ ["packagegroup-core-sdk","do_package"] ] exceptions = [] self.run_test_cdn_mirror("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) - def test_cdn_mirror_qemuarm64(self): + def _test_cdn_mirror_qemuarm64(self): exceptions = [] self.run_test_cdn_mirror("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions)