diff options
| author | Richard Hughes <richard@hughsie.com> | 2016-01-21 15:05:31 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2016-01-21 15:50:53 +0000 |
| commit | bdbc690fac186a2afbb8ef8a618aa510c9f3367a (patch) | |
| tree | 1c3e122fbba92a74c1eaaa7a2c087275bb6afb0b | |
| parent | a6c7bf7dc59facde6b21ba1415d57d918a9ae8a4 (diff) | |
| download | appstream-glib-bdbc690fac186a2afbb8ef8a618aa510c9f3367a.tar.gz | |
Only build the test firmware files when using --enable-firmware
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | data/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | libappstream-builder/asb-self-test.c | 4 | ||||
| -rw-r--r-- | libappstream-glib/as-self-test.c | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0a5851c..e4cffe8 100644 --- a/configure.ac +++ b/configure.ac @@ -150,9 +150,13 @@ if test x$enable_builder != xno; then PKG_CHECK_MODULES(GTK, gtk+-3.0) PKG_CHECK_MODULES(SQLITE, sqlite3) PKG_CHECK_MODULES(FREETYPE, pango fontconfig freetype2 >= 9.10.0) - AC_PATH_PROG(GCAB, [gcab], [no]) - if test x$GCAB = "xno" ; then - AC_MSG_ERROR([gcab program not found]) + + # only for firmware */ + if test x$enable_firmware != xno; then + AC_PATH_PROG(GCAB, [gcab], [no]) + if test x$GCAB = "xno" ; then + AC_MSG_ERROR([gcab program not found]) + fi fi # ostree (default enabled) diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am index be138fe..368a556 100644 --- a/data/tests/Makefile.am +++ b/data/tests/Makefile.am @@ -51,6 +51,7 @@ test_files = \ validate.xml.gz if HAVE_BUILDER +if HAVE_GCAB colorhug-als-2.0.0.cab: $(srcdir)/firmware/2_0_0/firmware.* $(AM_V_GEN) touch -c -m -d"2000-01-01T00:00:00" $?; \ $(GCAB) --create --nopath $@ \ @@ -74,6 +75,7 @@ BUILT_SOURCES = \ colorhug-als-2.0.1.cab \ colorhug-als-2.0.2.cab endif +endif CLEANFILES = \ $(BUILT_SOURCES) \ diff --git a/libappstream-builder/asb-self-test.c b/libappstream-builder/asb-self-test.c index 61db8d9..18f8e15 100644 --- a/libappstream-builder/asb-self-test.c +++ b/libappstream-builder/asb-self-test.c @@ -540,6 +540,7 @@ asb_test_context_test_func (AsbTestContextMode mode) "<value key=\"X-CacheID\">app-1-1.fc21.x86_64.rpm</value>\n" "</metadata>\n" "</component>\n" +#ifdef HAVE_GCAB "<component type=\"firmware\">\n" "<id>com.hughski.ColorHug2.firmware</id>\n" "<name>ColorHug Firmware</name>\n" @@ -569,6 +570,7 @@ asb_test_context_test_func (AsbTestContextMode mode) "<value key=\"X-CacheID\">colorhug-als-2.0.2.cab</value>\n" "</metadata>\n" "</component>\n" +#endif "</components>\n"; ret = asb_test_compare_lines (xml->str, expected_xml, &error); g_assert_no_error (error); @@ -784,6 +786,7 @@ asb_test_context_oldcache_func (void) static void asb_test_firmware_func (void) { +#ifdef HAVE_GCAB AsApp *app; AsbPluginLoader *loader; const gchar *expected_xml; @@ -899,6 +902,7 @@ asb_test_firmware_func (void) ret = asb_utils_rmtree ("/tmp/asbuilder", &error); g_assert_no_error (error); g_assert (ret); +#endif } int diff --git a/libappstream-glib/as-self-test.c b/libappstream-glib/as-self-test.c index 53d3b29..24275cc 100644 --- a/libappstream-glib/as-self-test.c +++ b/libappstream-glib/as-self-test.c @@ -2893,6 +2893,7 @@ as_test_store_merges_local_func (void) static void as_test_store_cab_func (void) { +#ifdef HAVE_GCAB gboolean ret; const gchar *src; g_autoptr(GError) error = NULL; @@ -2945,6 +2946,7 @@ as_test_store_cab_func (void) ret = as_test_compare_lines (xml->str, src, &error); g_assert_no_error (error); g_assert (ret); +#endif } static void |