diff --git a/meta/lib/oeqa/sdk/cases/gtk3.py b/meta/lib/oeqa/sdk/cases/gtk3.py index 1d953eecf1..cdaf50ed38 100644 --- a/meta/lib/oeqa/sdk/cases/gtk3.py +++ b/meta/lib/oeqa/sdk/cases/gtk3.py @@ -7,40 +7,34 @@ import os import subprocess import tempfile -import unittest -from oeqa.sdk.case import OESDKTestCase +from oeqa.sdk.cases.meson import MesonTestBase + from oeqa.utils.subprocesstweak import errors_have_output errors_have_output() -class GTK3Test(OESDKTestCase): +class GTK3Test(MesonTestBase): + + def setUp(self): + super().setUp() + self.ensure_target_package("gtk+3", "libgtk-3.0", recipe="gtk+3") + self.ensure_host_package("glib-2.0-utils", "libglib-2.0-utils", recipe="glib-2.0") + """ Test that autotools and GTK+ 3 compiles correctly. """ - def setUp(self): - libc = self.td.get("TCLIBC") - if libc in [ 'newlib' ]: - raise unittest.SkipTest("GTK3Test class: SDK doesn't contain a supported C library") + def test_libhandy(self): + with tempfile.TemporaryDirectory(prefix="libhandy", dir=self.tc.sdk_dir) as testdir: + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://download.gnome.org/sources/libhandy/1.8/libhandy-1.8.3.tar.xz") - self.ensure_host_package(recipe="intltool") - self.ensure_target_package("gtk+3", "libgtk-3.0", recipe="gtk+3") - - def test_galculator(self): - with tempfile.TemporaryDirectory(prefix="galculator", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2") - - dirs = {} - dirs["source"] = os.path.join(testdir, "galculator-2.1.4") - dirs["build"] = os.path.join(testdir, "build") - dirs["install"] = os.path.join(testdir, "install") + sourcedir = os.path.join(testdir, "libhandy-1.8.3") + builddir = os.path.join(testdir, "build") + installdir = os.path.join(testdir, "install") subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT) - self.assertTrue(os.path.isdir(dirs["source"])) - os.makedirs(dirs["build"]) + self.assertTrue(os.path.isdir(sourcedir)) + os.makedirs(builddir) - self._run("cd {source} && sed -i -e '/s_preferences.*prefs;/d' src/main.c && autoreconf -i -f -I $OECORE_TARGET_SYSROOT/usr/share/aclocal -I m4".format(**dirs)) - self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) - self._run("cd {build} && make -j".format(**dirs)) - self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) - - self.check_elf(os.path.join(dirs["install"], "usr", "local", "bin", "galculator")) + self.build_meson(sourcedir, builddir, installdir, "-Dglade_catalog=disabled -Dintrospection=disabled -Dvapi=false") + self.assertTrue(os.path.isdir(installdir)) + self.check_elf(os.path.join(installdir, "usr", "local", "lib", "libhandy-1.so"))