summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-27 11:07:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:31 +0100
commit3af9f06f1ba156b7b34c934802d03e4fab225a1e (patch)
treedad896188977627bae4e86469bf9187a227c60ba /meta/lib
parent00f0d2bfa0a05232a2926f21ef8fe533f436185d (diff)
downloadpoky-3af9f06f1ba156b7b34c934802d03e4fab225a1e.tar.gz
oeqa/sdk/gcc: Fix makefile test
The makefile test was hardcoding a test for gcc. In the SDK context, we need to use $(CC) to use the cross compiler. (From OE-Core rev: d28ddc23bbf232901ae07f7a01f821ecc4b79e32) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/files/testsdkmakefile5
-rw-r--r--meta/lib/oeqa/sdk/gcc.py6
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/lib/oeqa/runtime/files/testsdkmakefile b/meta/lib/oeqa/runtime/files/testsdkmakefile
new file mode 100644
index 0000000000..fb05f822f3
--- /dev/null
+++ b/meta/lib/oeqa/runtime/files/testsdkmakefile
@@ -0,0 +1,5 @@
1test: test.o
2 $(CC) -o test test.o -lm
3test.o: test.c
4 $(CC) -c test.c
5
diff --git a/meta/lib/oeqa/sdk/gcc.py b/meta/lib/oeqa/sdk/gcc.py
index 67994b9b5a..8395b9b908 100644
--- a/meta/lib/oeqa/sdk/gcc.py
+++ b/meta/lib/oeqa/sdk/gcc.py
@@ -14,7 +14,7 @@ class GccCompileTest(oeSDKTest):
14 14
15 @classmethod 15 @classmethod
16 def setUpClass(self): 16 def setUpClass(self):
17 for f in ['test.c', 'test.cpp', 'testmakefile']: 17 for f in ['test.c', 'test.cpp', 'testsdkmakefile']:
18 shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f) 18 shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f)
19 19
20 def test_gcc_compile(self): 20 def test_gcc_compile(self):
@@ -27,10 +27,10 @@ class GccCompileTest(oeSDKTest):
27 self._run('$CXX %s/test.cpp -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir)) 27 self._run('$CXX %s/test.cpp -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir))
28 28
29 def test_make(self): 29 def test_make(self):
30 self._run('cd %s; make -f testmakefile' % self.tc.sdktestdir) 30 self._run('cd %s; make -f testsdkmakefile' % self.tc.sdktestdir)
31 31
32 @classmethod 32 @classmethod
33 def tearDownClass(self): 33 def tearDownClass(self):
34 files = [self.tc.sdktestdir + f for f in ['test.c', 'test.cpp', 'test.o', 'test', 'testmakefile']] 34 files = [self.tc.sdktestdir + f for f in ['test.c', 'test.cpp', 'test.o', 'test', 'testsdkmakefile']]
35 for f in files: 35 for f in files:
36 bb.utils.remove(f) 36 bb.utils.remove(f)