| Message ID | 20181210171141.10722-4-ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] nss: fix Upstream-Status format | expand |
There's a failure related to this patch. https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/80/steps/7/logs/step1c Best Regards, Chen Qi On 12/11/2018 01:11 AM, Ross Burton wrote: > Don't use the helper class as it gets in the way more than it helps, exercise > the out-of-tree paths, and verify the installed files match the expected > architecture. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/lib/oeqa/sdk/cases/buildlzip.py | 46 +++++++++++++----------------------- > 1 file changed, 16 insertions(+), 30 deletions(-) > > diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py > index b57fbbece7f..d98e10fc37f 100644 > --- a/meta/lib/oeqa/sdk/cases/buildlzip.py > +++ b/meta/lib/oeqa/sdk/cases/buildlzip.py > @@ -1,39 +1,25 @@ > -import unittest > +import os, tempfile, subprocess, unittest > from oeqa.sdk.case import OESDKTestCase > -from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject > - > from oeqa.utils.subprocesstweak import errors_have_output > errors_have_output() > > class BuildLzipTest(OESDKTestCase): > - td_vars = ['DATETIME'] > - > - @classmethod > - def setUpClass(self): > - dl_dir = self.td.get('DL_DIR', None) > - > - self.project = SDKBuildProject(self.tc.sdk_dir + "/lzip/", self.tc.sdk_env, > - "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz", > - self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir) > - self.project.download_archive() > - > - def setUp(self): > - machine = self.td.get("MACHINE") > - > - if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or > - self.tc.hasHostPackage("^gcc-", regex=True)): > - raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") > - > def test_lzip(self): > - self.assertEqual(self.project.run_configure(), 0, > - msg="Running configure failed") > + with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir: > + dl_dir = self.td.get('DL_DIR', None) > + tarball = self.fetch(testdir, dl_dir, "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz") > + > + dirs = {} > + dirs["source"] = os.path.join(testdir, "lzip-1.19") > + dirs["build"] = os.path.join(testdir, "build") > + dirs["install"] = os.path.join(testdir, "install") > > - self.assertEqual(self.project.run_make(), 0, > - msg="Running make failed") > + subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) > + self.assertTrue(os.path.isdir(dirs["source"])) > + os.makedirs(dirs["build"]) > > - self.assertEqual(self.project.run_install(), 0, > - msg="Running make install failed") > + self._run("cd {build} && {source}/configure --srcdir {source} $CONFIGURE_FLAGS".format(**dirs)) > + self._run("cd {build} && make -j".format(**dirs)) > + self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) > > - @classmethod > - def tearDownClass(self): > - self.project.clean() > + self.check_elf(os.path.join(dirs["install"], "usr", "local", "bin", "lzip")) -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
On Tue, 11 Dec 2018 at 09:44, ChenQi <Qi.Chen@windriver.com> wrote: > There's a failure related to this patch. > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/80/steps/7/logs/step1c Strictly speaking the test was already broken, now it tells us. :) Shall fix. Ross -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py index b57fbbece7f..d98e10fc37f 100644 --- a/meta/lib/oeqa/sdk/cases/buildlzip.py +++ b/meta/lib/oeqa/sdk/cases/buildlzip.py @@ -1,39 +1,25 @@ -import unittest +import os, tempfile, subprocess, unittest from oeqa.sdk.case import OESDKTestCase -from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject - from oeqa.utils.subprocesstweak import errors_have_output errors_have_output() class BuildLzipTest(OESDKTestCase): - td_vars = ['DATETIME'] - - @classmethod - def setUpClass(self): - dl_dir = self.td.get('DL_DIR', None) - - self.project = SDKBuildProject(self.tc.sdk_dir + "/lzip/", self.tc.sdk_env, - "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz", - self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir) - self.project.download_archive() - - def setUp(self): - machine = self.td.get("MACHINE") - - if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or - self.tc.hasHostPackage("^gcc-", regex=True)): - raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") - def test_lzip(self): - self.assertEqual(self.project.run_configure(), 0, - msg="Running configure failed") + with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir: + dl_dir = self.td.get('DL_DIR', None) + tarball = self.fetch(testdir, dl_dir, "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz") + + dirs = {} + dirs["source"] = os.path.join(testdir, "lzip-1.19") + dirs["build"] = os.path.join(testdir, "build") + dirs["install"] = os.path.join(testdir, "install") - self.assertEqual(self.project.run_make(), 0, - msg="Running make failed") + subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) + self.assertTrue(os.path.isdir(dirs["source"])) + os.makedirs(dirs["build"]) - self.assertEqual(self.project.run_install(), 0, - msg="Running make install failed") + self._run("cd {build} && {source}/configure --srcdir {source} $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && make -j".format(**dirs)) + self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) - @classmethod - def tearDownClass(self): - self.project.clean() + self.check_elf(os.path.join(dirs["install"], "usr", "local", "bin", "lzip"))
Don't use the helper class as it gets in the way more than it helps, exercise the out-of-tree paths, and verify the installed files match the expected architecture. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/lib/oeqa/sdk/cases/buildlzip.py | 46 +++++++++++++----------------------- 1 file changed, 16 insertions(+), 30 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core