From 4c00256dd987ee1a15ebecec7f7411f90e938f14 Mon Sep 17 00:00:00 2001 From: Lucian Musat Date: Wed, 14 Jan 2015 17:14:15 +0200 Subject: oeqa/ptest: Removed buildhistory as requirement for ptest (From OE-Core rev: 990c0048fc7fe363b679943fe0ed0434645711d9) Signed-off-by: Lucian Musat Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/_ptest.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/lib/oeqa/runtime/_ptest.py') diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index 53b0807c4a..bf4d04171c 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py @@ -99,8 +99,6 @@ class PtestRunnerTest(oeRuntimeTest): return complementary_pkgs.split() def setUp(self): - self.buildhist_dir = oeRuntimeTest.tc.d.getVar("BUILDHISTORY_DIR_IMAGE", True) - self.assertTrue(os.path.exists(self.buildhist_dir)) self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True)) @skipUnlessPassed('test_ssh') @@ -113,12 +111,12 @@ class PtestRunnerTest(oeRuntimeTest): self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0) self.target.copy_from('/tmp/ptest.log', self.ptest_log) - shutil.copyfile(self.ptest_log, os.path.join(self.buildhist_dir, "ptest.log")) + shutil.copyfile(self.ptest_log, "ptest.log") - result = self.parse_ptest(os.path.join(self.buildhist_dir, "ptest.log")) + result = self.parse_ptest("ptest.log") log_results_to_location = "./results" if os.path.exists(log_results_to_location): shutil.rmtree(log_results_to_location) os.makedirs(log_results_to_location) - result.log_as_files(log_results_to_location, test_status = ['fail']) + result.log_as_files(log_results_to_location, test_status = ['pass','fail']) -- cgit v1.2.3-54-g00ecf