[gnome-settings-daemon] color: Fix 'make check' after the GcmTable removal
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] color: Fix 'make check' after the GcmTable removal
- Date: Mon, 3 Oct 2011 14:20:13 +0000 (UTC)
commit dd78465ad6a76791846922620765a99aae26b167
Author: Richard Hughes <richard hughsie com>
Date: Mon Oct 3 15:19:48 2011 +0100
color: Fix 'make check' after the GcmTable removal
plugins/color/Makefile.am | 5 ++---
plugins/color/gcm-self-test.c | 32 --------------------------------
2 files changed, 2 insertions(+), 35 deletions(-)
---
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 3c97877..6b8707a 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -52,8 +52,6 @@ gcm_self_test_CFLAGS = \
$(AM_CFLAGS)
gcm_self_test_SOURCES = \
- gcm-tables.c \
- gcm-tables.h \
gcm-dmi.c \
gcm-dmi.h \
gcm-edid.c \
@@ -63,7 +61,8 @@ gcm_self_test_SOURCES = \
gcm_self_test_LDADD = \
$(COLOR_LIBS) \
$(LCMS_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(SETTINGS_PLUGIN_LIBS) \
+ -lm
TESTS = gcm-self-test
diff --git a/plugins/color/gcm-self-test.c b/plugins/color/gcm-self-test.c
index 073d090..5bd5e69 100644
--- a/plugins/color/gcm-self-test.c
+++ b/plugins/color/gcm-self-test.c
@@ -27,37 +27,6 @@
#include "gcm-edid.h"
#include "gcm-dmi.h"
-#include "gcm-tables.h"
-
-static void
-gcm_test_tables_func (void)
-{
- GcmTables *tables;
- GError *error = NULL;
- gchar *vendor;
-
- tables = gcm_tables_new ();
- g_assert (tables != NULL);
-
- vendor = gcm_tables_get_pnp_id (tables, "IBM", &error);
- g_assert_no_error (error);
- g_assert (vendor != NULL);
- g_assert_cmpstr (vendor, ==, "IBM France");
- g_free (vendor);
-
- vendor = gcm_tables_get_pnp_id (tables, "MIL", &error);
- g_assert_no_error (error);
- g_assert (vendor != NULL);
- g_assert_cmpstr (vendor, ==, "Marconi Instruments Ltd");
- g_free (vendor);
-
- vendor = gcm_tables_get_pnp_id (tables, "XXX", &error);
- g_assert_error (error, GCM_TABLES_ERROR, GCM_TABLES_ERROR_FAILED);
- g_assert_cmpstr (vendor, ==, NULL);
- g_error_free (error);
-
- g_object_unref (tables);
-}
static void
gcm_test_dmi_func (void)
@@ -136,7 +105,6 @@ main (int argc, char **argv)
gtk_init (&argc, &argv);
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/color/tables", gcm_test_tables_func);
g_test_add_func ("/color/dmi", gcm_test_dmi_func);
g_test_add_func ("/color/edid", gcm_test_edid_func);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]