From d28ddc23bbf232901ae07f7a01f821ecc4b79e32 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 27 Sep 2015 11:07:38 +0100 Subject: 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. Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/files/testsdkmakefile | 5 +++++ meta/lib/oeqa/sdk/gcc.py | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 meta/lib/oeqa/runtime/files/testsdkmakefile 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 @@ +test: test.o + $(CC) -o test test.o -lm +test.o: test.c + $(CC) -c test.c + 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): @classmethod def setUpClass(self): - for f in ['test.c', 'test.cpp', 'testmakefile']: + for f in ['test.c', 'test.cpp', 'testsdkmakefile']: shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f) def test_gcc_compile(self): @@ -27,10 +27,10 @@ class GccCompileTest(oeSDKTest): self._run('$CXX %s/test.cpp -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir)) def test_make(self): - self._run('cd %s; make -f testmakefile' % self.tc.sdktestdir) + self._run('cd %s; make -f testsdkmakefile' % self.tc.sdktestdir) @classmethod def tearDownClass(self): - files = [self.tc.sdktestdir + f for f in ['test.c', 'test.cpp', 'test.o', 'test', 'testmakefile']] + files = [self.tc.sdktestdir + f for f in ['test.c', 'test.cpp', 'test.o', 'test', 'testsdkmakefile']] for f in files: bb.utils.remove(f) -- cgit 1.2.3-korg