summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-02-03 21:22:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-09 09:40:01 +0000
commitd7c0e00e40c3eadb139a663bdfef15b2d2cb1408 (patch)
tree28313faea0e91051650cecbb298b5b810127d3c9 /meta/lib/oeqa
parent4354cb29e7c25eb2a8927caf3856a6c899fe3c3f (diff)
downloadpoky-d7c0e00e40c3eadb139a663bdfef15b2d2cb1408.tar.gz
oeqa/utils: targetbuild: don't use bb.fetch anymore
When running tests outside of the build system we can't use bb.fetch anymore. It was nice but tests and their modules need to rely on the data storage only as that gets exported. This module is used by the oeqa/runtime/build* tests. (From OE-Core rev: 3caf8e244ea94f62a93f3b40e73e15ea78fc2880) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/utils/targetbuild.py27
1 files changed, 8 insertions, 19 deletions
diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/targetbuild.py
index 9b2cf53773..77181b1c3d 100644
--- a/meta/lib/oeqa/utils/targetbuild.py
+++ b/meta/lib/oeqa/utils/targetbuild.py
@@ -4,11 +4,9 @@
4 4
5# Provides a class for automating build tests for projects 5# Provides a class for automating build tests for projects
6 6
7from oeqa.oetest import oeRuntimeTest
8import bb.fetch2
9import bb.data
10import os 7import os
11import re 8import re
9import subprocess
12 10
13 11
14class TargetBuildProject(): 12class TargetBuildProject():
@@ -16,26 +14,16 @@ class TargetBuildProject():
16 def __init__(self, target, uri, foldername=None): 14 def __init__(self, target, uri, foldername=None):
17 self.target = target 15 self.target = target
18 self.uri = uri 16 self.uri = uri
19 self.targetdir = "/home/root/" 17 self.targetdir = "~/"
20 18 self.archive = os.path.basename(uri)
21 self.localdata = bb.data.createCopy(oeRuntimeTest.tc.d) 19 self.localarchive = "/tmp/" + self.archive
22 bb.data.update_data(self.localdata) 20 self.fname = re.sub(r'.tar.bz2|tar.gz$', '', self.archive)
23 21 if foldername:
24 if not foldername:
25 self.archive = os.path.basename(uri)
26 self.fname = re.sub(r'.tar.bz2|tar.gz$', '', self.archive)
27 else:
28 self.fname = foldername 22 self.fname = foldername
29 23
30 def download_archive(self): 24 def download_archive(self):
31 25
32 try: 26 subprocess.check_call("wget -O %s %s" % (self.localarchive, self.uri), shell=True)
33 self.localdata.delVar("BB_STRICT_CHECKSUM")
34 fetcher = bb.fetch2.Fetch([self.uri], self.localdata)
35 fetcher.download()
36 self.localarchive = fetcher.localpath(self.uri)
37 except bb.fetch2.BBFetchException:
38 raise Exception("Failed to download archive: %s" % self.uri)
39 27
40 (status, output) = self.target.copy_to(self.localarchive, self.targetdir) 28 (status, output) = self.target.copy_to(self.localarchive, self.targetdir)
41 if status != 0: 29 if status != 0:
@@ -61,3 +49,4 @@ class TargetBuildProject():
61 49
62 def clean(self): 50 def clean(self):
63 self.target.run('rm -rf %s' % self.targetdir) 51 self.target.run('rm -rf %s' % self.targetdir)
52 subprocess.call('rm -f %s' % self.localarchive, shell=True)