From patchwork Wed Oct 17 23:00:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anibal Limon X-Patchwork-Id: 149079 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1242412lji; Wed, 17 Oct 2018 16:00:57 -0700 (PDT) X-Google-Smtp-Source: ACcGV610zBblIxGuDFDaIRzBUuNgy0aFOnHLd3U87t6UPf3cxX0f2XnVySg/1Ndmv42FupkcOgKL X-Received: by 2002:a63:480e:: with SMTP id v14-v6mr25983185pga.308.1539817257051; Wed, 17 Oct 2018 16:00:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539817257; cv=none; d=google.com; s=arc-20160816; b=OldG7Ap8dNylztPiiqgYJRvHKHeIaumB0jpF+uJYqHrXyQybzckm7aK2na0JTtkugJ 1d1+ereAuScZLW4kRkhKBrJ8ncA8VOwHARhLKrXgl5VD68D2X+eDs7k3HHewBF9msHzd oicH4546uFvkY5LmHKRDD/edpQZh36Y+Moho2/xjAD/BPhFOceuuzBuKq0Fii2E7WchP ayzFUyoxCHkLz9G8HC0CaPtKdXpnXQMYuVIOdaW70/0ITIK/IZmiv1k93IwdskYAYx13 4De/AurdZWhR341GYHmr1UR3YFj21fvLObUQxscIhsO2Af/pHerFEQC0QWKwK6XCuJZ9 8pWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=cCxAfsD2O+Lk8FsPq2uvW0iM/AQIHWLLmrHAMuvQ9HQ=; b=XIPSXh0SAbDJWAzhUwZls6qPsIxC6hi/7qr4pljkt09O7dA9UeP0EMGgmUSpZ4IEPo q9y26/tYJ38FuxfotDmXxCCaFibpDlwZ7sY9OruCvtLG5yAKsvN6fL43lHglvdo8M6w9 tXMkioXfHkfmtcVGzTIniOyWhUodUW3jHGCgCjV/o/5iyPhtq+MZK93VQNNW5rtSIytu UuyZ1S+5cqmTfc2btH5PQ8i1rKUpKJBiP30JoaQhTRQpa9BVuyasyHmkwUy0LTLuzeN4 J5vDguNAoD8bU4dhuogz0yhQRhWPOgmpbpoaatpybChfIPMEvrhbFZraIi/fb7rSri0J PNmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DYUlyvv3; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y66-v6si18447366pgy.496.2018.10.17.16.00.56; Wed, 17 Oct 2018 16:00:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DYUlyvv3; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 79F8179B34; Wed, 17 Oct 2018 23:00:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id F146D79B29 for ; Wed, 17 Oct 2018 23:00:47 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id u6-v6so10657764plz.4 for ; Wed, 17 Oct 2018 16:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dor5KBE0yFJCC2LlS6kG6gIwWlmsRORXfdirHAVO/m4=; b=DYUlyvv3TxT2x5ZrTWNEMdOXYCtzjw5W0WU3ZatYKAJuBfrvQ9yt5JGobTQrnkl20J Uwt67pVwueMINs7XNqhdcU2DATw/ZMWUtrnodw3cmwbrcRs45dAeHpT1g4vGXFEKWkNH XpuQpkY7cLOKe0DADy0Vt4+Vfuu0Ke5wqglQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dor5KBE0yFJCC2LlS6kG6gIwWlmsRORXfdirHAVO/m4=; b=KOOl6l1vMbYMBSnZfDVzh0VniMCL8UqW85tbbgTWVlImI9Vxasic8sKzpVXEQVZ5NM LZGErk0UkvXx0L+e0Chr6vE9kJLPqjklcjPS9OLbvb/PGfY+wnoTTnfU3zMaAMj5Q8WI NGdRkSAK1RizjDt8HhAupJTUTFUStoQViJX+NhEB8Y8WZwdpAHCEYSKsSe1MEoZc7OsT Lfq9DmTwQiwuCGuohFzuNkF3JRq88PsrM4y+ZJ+jSZLYsmD4yRi7Bi00wc+QZg7lpZOY Aak9LufrmcBI8w6dlTnFHRGRyZAmuZFNmlg3+6JxtalfWSIaVh6MM423XGbP9foCxM12 RjOg== X-Gm-Message-State: ABuFfoipAEstephVDhfiIYR8akBBwBumZ5bvC9VmSvB/wqXnd0Owywqf 6nZ/ERj+Z/FMJC4jwe2+vQestNxN7oM= X-Received: by 2002:a17:902:7b84:: with SMTP id w4-v6mr26809847pll.32.1539817248651; Wed, 17 Oct 2018 16:00:48 -0700 (PDT) Received: from blackbox.Home ([200.68.141.5]) by smtp.gmail.com with ESMTPSA id i71-v6sm26467929pgc.87.2018.10.17.16.00.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Oct 2018 16:00:48 -0700 (PDT) From: =?utf-8?b?QW7DrWJhbCBMaW3Ds24=?= To: openembedded-core@lists.openembedded.org Date: Wed, 17 Oct 2018 18:00:43 -0500 Message-Id: <20181017230044.24098-1-anibal.limon@linaro.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/2] meta/classes/testexport: Use manfiest filenames for package and testdata X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Is clear to know for what image and machine the testexport package manifest and testdata was build. Signed-off-by: Aníbal Limón --- meta/classes/testexport.bbclass | 4 ++-- meta/lib/oeqa/runtime/context.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index d070f07afa..8b01504d3a 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass @@ -128,8 +128,8 @@ def copy_needed_files(d, tc): tdname = "%s.testdata.json" % image_name test_data_path = os.path.join(export_path, 'data') bb.utils.mkdirhier(test_data_path) - shutil.copy2(image_manifest, os.path.join(test_data_path, 'manifest')) - shutil.copy2(tdname, os.path.join(test_data_path, 'testdata.json')) + shutil.copy2(image_manifest, os.path.join(test_data_path, os.path.basename(image_manifest))) + shutil.copy2(tdname, os.path.join(test_data_path, os.path.basename(tdname))) # Create tar file for common parts of testexport create_tarball(d, "testexport.tar.gz", d.getVar("TEST_EXPORT_DIR")) diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index a7f3823996..31dba75784 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -2,6 +2,7 @@ # Released under the MIT license (see COPYING.MIT) import os +import glob from oeqa.core.context import OETestContext, OETestContextExecutor from oeqa.core.target.ssh import OESSHTarget @@ -42,11 +43,15 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): default_cases = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'cases') default_data = None - default_test_data = 'data/testdata.json' + m = glob.glob('data/*.testdata.json') + if m: + default_test_data = m[0] default_tests = '' default_target_type = 'simpleremote' - default_manifest = 'data/manifest' + m = glob.glob('data/*.manifest') + if m: + default_manifest = m[0] default_server_ip = '192.168.7.1' default_target_ip = '192.168.7.2' default_host_dumper_dir = '/tmp/oe-saved-tests'