summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest/bbtests.py
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-20 13:49:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-21 22:56:06 +0100
commit322c3248e9089878a0658b55d3037c6537e6a9cb (patch)
treed8f6ba7e59cba79589264e6989dee348e71866d9 /meta/lib/oeqa/selftest/bbtests.py
parentcf311a770e50ea73cefa2a2c53616500411aa4ac (diff)
downloadpoky-322c3248e9089878a0658b55d3037c6537e6a9cb.tar.gz
oeqa/selftest/bbtests: clean up local DL_DIR/SSTATE_DIR safely
Now that the selftests clean selftest.inc in the tearDown using bitbake in a function passed to addCleanup (which happens after teardown) will use the default configuration and not the customised one. As the intention was to clean away the temporary DL_DIR and SSTATE_DIR, simple use track_for_cleanup to delete the entire directory instead. (From OE-Core rev: aa3b859524bb693d3b150a8873a2ee24c78eac0a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/bbtests.py')
-rw-r--r--meta/lib/oeqa/selftest/bbtests.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index 3d6860f652..af0773df10 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -101,6 +101,8 @@ class BitbakeTests(oeSelfTest):
101 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" 101 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
102SSTATE_DIR = \"${TOPDIR}/download-selftest\" 102SSTATE_DIR = \"${TOPDIR}/download-selftest\"
103""") 103""")
104 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
105
104 bitbake('-ccleanall man') 106 bitbake('-ccleanall man')
105 result = bitbake('-c fetch man', ignore_status=True) 107 result = bitbake('-c fetch man', ignore_status=True)
106 bitbake('-ccleanall man') 108 bitbake('-ccleanall man')
@@ -116,12 +118,13 @@ doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result
116 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" 118 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
117SSTATE_DIR = \"${TOPDIR}/download-selftest\" 119SSTATE_DIR = \"${TOPDIR}/download-selftest\"
118""") 120""")
121 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
122
119 data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' 123 data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"'
120 self.write_recipeinc('aspell', data) 124 self.write_recipeinc('aspell', data)
121 bitbake('-ccleanall aspell') 125 bitbake('-ccleanall aspell')
122 result = bitbake('-c fetch aspell', ignore_status=True) 126 result = bitbake('-c fetch aspell', ignore_status=True)
123 self.delete_recipeinc('aspell') 127 self.delete_recipeinc('aspell')
124 self.addCleanup(bitbake, '-ccleanall aspell')
125 self.assertEqual(result.status, 0, msg = "Couldn't fetch aspell. %s" % result.output) 128 self.assertEqual(result.status, 0, msg = "Couldn't fetch aspell. %s" % result.output)
126 self.assertTrue(os.path.isfile(os.path.join(get_bb_var("DL_DIR"), 'test-aspell.tar.gz')), msg = "File rename failed. No corresponding test-aspell.tar.gz file found under %s" % str(get_bb_var("DL_DIR"))) 129 self.assertTrue(os.path.isfile(os.path.join(get_bb_var("DL_DIR"), 'test-aspell.tar.gz')), msg = "File rename failed. No corresponding test-aspell.tar.gz file found under %s" % str(get_bb_var("DL_DIR")))
127 self.assertTrue(os.path.isfile(os.path.join(get_bb_var("DL_DIR"), 'test-aspell.tar.gz.done')), "File rename failed. No corresponding test-aspell.tar.gz.done file found under %s" % str(get_bb_var("DL_DIR"))) 130 self.assertTrue(os.path.isfile(os.path.join(get_bb_var("DL_DIR"), 'test-aspell.tar.gz.done')), "File rename failed. No corresponding test-aspell.tar.gz.done file found under %s" % str(get_bb_var("DL_DIR")))
@@ -181,6 +184,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
181 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" 184 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
182SSTATE_DIR = \"${TOPDIR}/download-selftest\" 185SSTATE_DIR = \"${TOPDIR}/download-selftest\"
183""") 186""")
187 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
184 self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) 188 self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" )
185 runCmd('bitbake -c cleanall man xcursor-transparent-theme') 189 runCmd('bitbake -c cleanall man xcursor-transparent-theme')
186 result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) 190 result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True)