summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucian Musat <george.l.musat@intel.com>2015-01-14 17:14:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:28 +0000
commit4c00256dd987ee1a15ebecec7f7411f90e938f14 (patch)
treec610ca3bfe2553dbc3e6a86bf8a853dc995ba600
parentc74ee53d61fb189b152b8e6a2d4bbcc9800c70e5 (diff)
downloadpoky-4c00256dd987ee1a15ebecec7f7411f90e938f14.tar.gz
oeqa/ptest: Removed buildhistory as requirement for ptest
(From OE-Core rev: 990c0048fc7fe363b679943fe0ed0434645711d9) Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/_ptest.py8
1 files changed, 3 insertions, 5 deletions
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):
99 return complementary_pkgs.split() 99 return complementary_pkgs.split()
100 100
101 def setUp(self): 101 def setUp(self):
102 self.buildhist_dir = oeRuntimeTest.tc.d.getVar("BUILDHISTORY_DIR_IMAGE", True)
103 self.assertTrue(os.path.exists(self.buildhist_dir))
104 self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True)) 102 self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME', True))
105 103
106 @skipUnlessPassed('test_ssh') 104 @skipUnlessPassed('test_ssh')
@@ -113,12 +111,12 @@ class PtestRunnerTest(oeRuntimeTest):
113 111
114 self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0) 112 self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0)
115 self.target.copy_from('/tmp/ptest.log', self.ptest_log) 113 self.target.copy_from('/tmp/ptest.log', self.ptest_log)
116 shutil.copyfile(self.ptest_log, os.path.join(self.buildhist_dir, "ptest.log")) 114 shutil.copyfile(self.ptest_log, "ptest.log")
117 115
118 result = self.parse_ptest(os.path.join(self.buildhist_dir, "ptest.log")) 116 result = self.parse_ptest("ptest.log")
119 log_results_to_location = "./results" 117 log_results_to_location = "./results"
120 if os.path.exists(log_results_to_location): 118 if os.path.exists(log_results_to_location):
121 shutil.rmtree(log_results_to_location) 119 shutil.rmtree(log_results_to_location)
122 os.makedirs(log_results_to_location) 120 os.makedirs(log_results_to_location)
123 121
124 result.log_as_files(log_results_to_location, test_status = ['fail']) 122 result.log_as_files(log_results_to_location, test_status = ['pass','fail'])