luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 15:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix make check

Browse Source
This commit is contained in:
Dan Winship
2010-11-07 12:56:08 -05:00
parent ba9fccf71e
commit 791d91a957
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gsettings.c
View File

@@ -1490,7 +1490,7 @@ g_settings_set_value (GSettings *settings,
if (!g_settings_key_info_range_check (&info, value)) if (!g_settings_key_info_range_check (&info, value))
{ {
g_warning ("gsettings_set_value: value for key '%s' in schema '%s' " g_warning ("g_settings_set_value: value for key '%s' in schema '%s' "
"is outside of valid range", "is outside of valid range",
key, key,
settings->priv->schema_name); settings->priv->schema_name);

10
gio/tests/gsettings.c
View File

@@ -62,7 +62,7 @@ test_basic (void)
abort (); abort ();
} }
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*g_settings_type_check*"); g_test_trap_assert_stderr ("*g_settings_set_value*expects type*");
} }
g_settings_get (settings, "greeting", "s", &str); g_settings_get (settings, "greeting", "s", &str);
@@ -1574,7 +1574,7 @@ test_enums (void)
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
g_settings_set_string (settings, "test", "qux"); g_settings_set_string (settings, "test", "qux");
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
g_settings_get_flags (settings, "test"); g_settings_get_flags (settings, "test");
@@ -1633,7 +1633,7 @@ test_flags (void)
g_settings_set_strv (settings, "f-test", g_settings_set_strv (settings, "f-test",
(const gchar **) g_strsplit ("rock", ",", 0)); (const gchar **) g_strsplit ("rock", ",", 0));
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
g_settings_get_enum (settings, "f-test"); g_settings_get_enum (settings, "f-test");
@@ -1692,12 +1692,12 @@ test_range (void)
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
g_settings_set_int (settings, "val", 45); g_settings_set_int (settings, "val", 45);
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
g_settings_set_int (settings, "val", 1); g_settings_set_int (settings, "val", 1);
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*g_settings_key_info_range_check*"); g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
} }
g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 33); g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 33);

1
glib/glib.symbols
View File

@@ -1675,6 +1675,7 @@ g_get_user_cache_dir
g_get_user_config_dir g_get_user_config_dir
g_get_user_data_dir g_get_user_data_dir
g_reload_user_special_dirs_cache g_reload_user_special_dirs_cache
g_get_user_runtime_dir
g_get_user_special_dir g_get_user_special_dir
#ifndef _WIN64 #ifndef _WIN64
g_get_user_name PRIVATE g_get_user_name PRIVATE