diff options
| author |   Ross Burton <ross.burton@intel.com> | 2019-01-03 18:55:41 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-07 17:45:42 +0000 |
| commit | f56c62b9feacd6e08fee3507185261ab3f0180e0 (patch) | |
| tree | de6118140e81ad054ad5b7d56651743453dc8b0f | |
| parent | 1239157805a4c363da853de6db05c53083b01189 (diff) | |
| download | openembedded-core-contrib-f56c62b9feacd6e08fee3507185261ab3f0180e0.tar.gz | |
oeqa/sdk/cases: clean up DL_DIR handling
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/assimp.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcpio.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildgalculator.py | 3 | ||||
| -rw-r--r-- | 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 21c9106881..595f383489 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 ff3e1347d3..9504ee8e05 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 164a695637..47d7580faf 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 a7ca239fb4..b7483bfea5 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") |