summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-01-03 18:55:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 11:16:45 +0000
commit730ffea3a188de575265a622723dbc9842fb0274 (patch)
tree6b4b6797239c3f40bb51a0729c7105a7193d6fca
parent5a0bed5be6fe2a62480c0a5fdddd1d99e599d4f9 (diff)
downloadpoky-730ffea3a188de575265a622723dbc9842fb0274.tar.gz
oeqa/sdk/cases: clean up DL_DIR handling
(From OE-Core rev: f56c62b9feacd6e08fee3507185261ab3f0180e0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/sdk/cases/assimp.py3
-rw-r--r--meta/lib/oeqa/sdk/cases/buildcpio.py3
-rw-r--r--meta/lib/oeqa/sdk/cases/buildgalculator.py3
-rw-r--r--meta/lib/oeqa/sdk/cases/buildlzip.py3
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):
20 def test_assimp(self): 20 def test_assimp(self):
21 import tempfile 21 import tempfile
22 with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir: 22 with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir:
23 dl_dir = self.td.get('DL_DIR', None) 23 tarball = self.fetch(testdir, self.td["DL_DIR"], "https://github.com/assimp/assimp/archive/v4.1.0.tar.gz")
24 tarball = self.fetch(testdir, dl_dir, "https://github.com/assimp/assimp/archive/v4.1.0.tar.gz")
25 subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) 24 subprocess.check_output(["tar", "xf", tarball, "-C", testdir])
26 25
27 sourcedir = os.path.join(testdir, "assimp-4.1.0") 26 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):
13 """ 13 """
14 def test_cpio(self): 14 def test_cpio(self):
15 with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: 15 with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir:
16 dl_dir = self.td.get('DL_DIR', None) 16 tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz")
17 tarball = self.fetch(testdir, dl_dir, "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz")
18 17
19 dirs = {} 18 dirs = {}
20 dirs["source"] = os.path.join(testdir, "cpio-2.12") 19 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):
20 20
21 def test_galculator(self): 21 def test_galculator(self):
22 with tempfile.TemporaryDirectory(prefix="galculator", dir=self.tc.sdk_dir) as testdir: 22 with tempfile.TemporaryDirectory(prefix="galculator", dir=self.tc.sdk_dir) as testdir:
23 dl_dir = self.td.get('DL_DIR', None) 23 tarball = self.fetch(testdir, self.td["DL_DIR"], "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2")
24 tarball = self.fetch(testdir, dl_dir, "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2")
25 24
26 dirs = {} 25 dirs = {}
27 dirs["source"] = os.path.join(testdir, "galculator-2.1.4") 26 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):
9 """ 9 """
10 def test_lzip(self): 10 def test_lzip(self):
11 with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir: 11 with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir:
12 dl_dir = self.td.get('DL_DIR', None) 12 tarball = self.fetch(testdir, self.td["DL_DIR"], "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz")
13 tarball = self.fetch(testdir, dl_dir, "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz")
14 13
15 dirs = {} 14 dirs = {}
16 dirs["source"] = os.path.join(testdir, "lzip-1.19") 15 dirs["source"] = os.path.join(testdir, "lzip-1.19")