From patchwork Tue Oct 2 03:12:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 977603 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42PPR15dDfz9s7T for ; Tue, 2 Oct 2018 13:15:09 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 79547C21FB8; Tue, 2 Oct 2018 03:14:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D3E48C21FCD; Tue, 2 Oct 2018 03:14:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8F73BC21FE2; Tue, 2 Oct 2018 03:13:51 +0000 (UTC) Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by lists.denx.de (Postfix) with ESMTPS id 0A3CFC22002 for ; Tue, 2 Oct 2018 03:13:48 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id z17-v6so549913qka.9 for ; Mon, 01 Oct 2018 20:13:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=crM37RxLN2jFyG8FFA+B+VhnUsCl4EjJgFSs8RBE5oA=; b=Ao+mWarsDlBLhZlW58LSkCngtwXis3ePqCletUuTR+rp/MJlok9rBUGGgkZq6sS4fc 4MWTOqdYhTfInDmObWQ4Qwrmp+VafsW+/HbRgsZxj5LW7yaSUAjI0b4nh3VITHIKwAr6 Qbt7CXe+5u5AMpv0KfE7K8qxiXtXksXSxI9yx3bpTqu8k2mIyxE1+ywe6z8VEPedboSC wQsculuiC0OerKuXnmwQc8Ai8fZG7Xy0my512KqhOuheQZP/b3u0MHPzN397vRTobjRp ar1U0p2IBNlXjMp068L03fFOwGvYq3kZYLvmJho98g30Ltd67zjM3PjS3g39wZr7lqGy II8Q== X-Gm-Message-State: ABuFfoj7CepjSTsIksKsiUTnDpOM9LGW+U1WLcRBSkcGRzuO9yD7vI+u 5BZLjORJWvvX2qWQltt6bOnJ4TE= X-Google-Smtp-Source: ACcGV60l3iEMJPSXhXnv5vyD91fc3rqbTXR9B3K/WhxZ7Ft6f22K0dDgWL3H7FCiElck9eNKRMUslHM= X-Received: by 2002:a37:3a86:: with SMTP id h128-v6mr10759751qka.4.1538450026954; Mon, 01 Oct 2018 20:13:46 -0700 (PDT) Date: Mon, 1 Oct 2018 21:12:35 -0600 In-Reply-To: <20181002031247.93384-1-sjg@chromium.org> Message-Id: <20181002031247.93384-6-sjg@chromium.org> Mime-Version: 1.0 References: <20181002031247.93384-1-sjg@chromium.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Stephen Warren , Alexander Graf Subject: [U-Boot] [PATCH v2 05/17] buildman: Make the toolchain test more forgiving X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The filenames of the toolchains on kernel.org changes every now and then. Fix it for the current change, and make the test use a regex so that it has a better chance of passing with future changes too. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- Changes in v2: None tools/buildman/test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/buildman/test.py b/tools/buildman/test.py index c36bcdf6fb7..7259f7b6507 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -422,8 +422,10 @@ class TestBuild(unittest.TestCase): def testToolchainDownload(self): """Test that we can download toolchains""" if use_network: - self.assertEqual('https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/x86_64-gcc-4.9.0-nolibc_arm-unknown-linux-gnueabi.tar.xz', - self.toolchains.LocateArchUrl('arm')) + url = self.toolchains.LocateArchUrl('arm') + self.assertRegexpMatches(url, 'https://www.kernel.org/pub/tools/' + 'crosstool/files/bin/x86_64/.*/' + 'x86_64-gcc-.*-nolibc_arm-.*linux-gnueabi.tar.xz') if __name__ == "__main__":