From: Ross Burton <ross.burton@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 5/7] oeqa/sdk/cases: clean up DL_DIR handling
Date: Mon, 7 Jan 2019 16:38:21 +0000 [thread overview]
Message-ID: <20190107163823.31816-5-ross.burton@intel.com> (raw)
In-Reply-To: <20190107163823.31816-1-ross.burton@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/lib/oeqa/sdk/cases/assimp.py | 3 +--
meta/lib/oeqa/sdk/cases/buildcpio.py | 3 +--
meta/lib/oeqa/sdk/cases/buildgalculator.py | 3 +--
meta/lib/oeqa/sdk/cases/buildlzip.py | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py b/meta/lib/oeqa/sdk/cases/assimp.py
index 21c91068815..595f3834894 100644
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ b/meta/lib/oeqa/sdk/cases/assimp.py
@@ -20,8 +20,7 @@ class BuildAssimp(OESDKTestCase):
def test_assimp(self):
import tempfile
with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir:
- dl_dir = self.td.get('DL_DIR', None)
- tarball = self.fetch(testdir, dl_dir, "https://github.com/assimp/assimp/archive/v4.1.0.tar.gz")
+ tarball = self.fetch(testdir, self.td["DL_DIR"], "https://github.com/assimp/assimp/archive/v4.1.0.tar.gz")
subprocess.check_output(["tar", "xf", tarball, "-C", testdir])
sourcedir = os.path.join(testdir, "assimp-4.1.0")
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py
index ff3e1347d37..9504ee8e053 100644
--- a/meta/lib/oeqa/sdk/cases/buildcpio.py
+++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
@@ -13,8 +13,7 @@ class BuildCpioTest(OESDKTestCase):
"""
def test_cpio(self):
with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir:
- dl_dir = self.td.get('DL_DIR', None)
- tarball = self.fetch(testdir, dl_dir, "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz")
+ tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz")
dirs = {}
dirs["source"] = os.path.join(testdir, "cpio-2.12")
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index 164a695637a..47d7580fafd 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -20,8 +20,7 @@ class GalculatorTest(OESDKTestCase):
def test_galculator(self):
with tempfile.TemporaryDirectory(prefix="galculator", dir=self.tc.sdk_dir) as testdir:
- dl_dir = self.td.get('DL_DIR', None)
- tarball = self.fetch(testdir, dl_dir, "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2")
+ tarball = self.fetch(testdir, self.td["DL_DIR"], "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2")
dirs = {}
dirs["source"] = os.path.join(testdir, "galculator-2.1.4")
diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py
index a7ca239fb49..b7483bfea51 100644
--- a/meta/lib/oeqa/sdk/cases/buildlzip.py
+++ b/meta/lib/oeqa/sdk/cases/buildlzip.py
@@ -9,8 +9,7 @@ class BuildLzipTest(OESDKTestCase):
"""
def test_lzip(self):
with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir:
- dl_dir = self.td.get('DL_DIR', None)
- tarball = self.fetch(testdir, dl_dir, "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz")
+ tarball = self.fetch(testdir, self.td["DL_DIR"], "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz")
dirs = {}
dirs["source"] = os.path.join(testdir, "lzip-1.19")
--
2.11.0
next prev parent reply other threads:[~2019-01-07 16:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 16:38 [PATCH 1/7] toolchain-scripts: run post-relocate scripts for every environment Ross Burton
2019-01-07 16:38 ` [PATCH 2/7] meson: use a sensible default for libdir when cross-compiling Ross Burton
2019-01-07 16:38 ` [PATCH 3/7] meson: fix nativesdk-meson for multilib SDKs Ross Burton
2019-01-07 19:03 ` Martin Kelly
2019-01-07 20:02 ` Burton, Ross
2019-01-07 20:07 ` Martin Kelly
2019-01-07 16:38 ` [PATCH 4/7] meson: write correct host endian into SDK cross file Ross Burton
2019-01-07 16:38 ` Ross Burton [this message]
2019-01-07 16:38 ` [PATCH 6/7] oeqa/sdk/assimp: cleanup Ross Burton
2019-01-07 16:38 ` [PATCH 7/7] oeqa/sdk: add test to exercise Meson Ross Burton
2019-01-07 16:44 ` Joshua Watt
2019-01-07 16:48 ` Burton, Ross
2019-01-07 17:03 ` ✗ patchtest: failure for "toolchain-scripts: run post-re..." and 6 more Patchwork
2019-01-08 11:01 ` [PATCH 1/7] toolchain-scripts: run post-relocate scripts for every environment Burton, Ross
2019-01-08 13:10 ` Joshua Watt
2019-01-08 13:19 ` Burton, Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190107163823.31816-5-ross.burton@intel.com \
--to=ross.burton@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox