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

Rename G_TEST_DISTED to G_TEST_DIST

Browse Source 
Since this feature is so utterly automake-centric, we may as well be
using the same terminology as automake itself (ie: although it's
BUILT_SOURCES, it's DIST_EXTRA, not DISTED).

Also add some comments to the enum explaining that these terms are
really corresponding directly to the automake terms.

https://bugzilla.gnome.org/show_bug.cgi?id=549783
This commit is contained in:
Ryan Lortie
2013-05-29 08:49:16 -04:00
parent da478acd3c
commit 8df1bb3486
14 changed files with 77 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gio/tests/appinfo.c
View File

@@ -15,7 +15,7 @@ test_launch (void)
const gchar *path;
gchar *uri;
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
g_assert (appinfo != NULL);
@@ -36,7 +36,7 @@ test_launch (void)
g_object_unref (file);
l = NULL;
uri = g_strconcat ("file://", g_test_get_dir (G_TEST_DISTED), "/appinfo-test.desktop", NULL);
uri = g_strconcat ("file://", g_test_get_dir (G_TEST_DIST), "/appinfo-test.desktop", NULL);
l = g_list_append (l, uri);
l = g_list_append (l, "file:///etc/group#adm");
@@ -59,7 +59,7 @@ test_locale (const char *locale)
g_setenv ("LANGUAGE", locale, TRUE);
setlocale (LC_ALL, "");
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
if (g_strcmp0 (locale, "C") == 0)
@@ -104,7 +104,7 @@ test_basic (void)
GIcon *icon, *icon2;
const gchar *path;
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
g_assert_cmpstr (g_app_info_get_id (appinfo), ==, "appinfo-test.desktop");
@@ -132,17 +132,17 @@ test_show_in (void)
g_desktop_app_info_set_desktop_env ("GNOME");
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
g_assert (g_app_info_should_show (appinfo));
g_object_unref (appinfo);
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test-gnome.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test-gnome.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
g_assert (g_app_info_should_show (appinfo));
g_object_unref (appinfo);
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test-notgnome.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test-notgnome.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
g_assert (!g_app_info_should_show (appinfo));
g_object_unref (appinfo);
@@ -282,7 +282,7 @@ test_tryexec (void)
GAppInfo *appinfo;
const gchar *path;
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test2.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test2.desktop", NULL);
appinfo = (GAppInfo*)g_desktop_app_info_new_from_filename (path);
g_assert (appinfo == NULL);
@@ -403,7 +403,7 @@ test_startup_wm_class (void)
const char *wm_class;
const gchar *path;
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
appinfo = g_desktop_app_info_new_from_filename (path);
wm_class = g_desktop_app_info_get_startup_wm_class (appinfo);
@@ -419,7 +419,7 @@ test_supported_types (void)
const char * const *content_types;
const gchar *path;
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
appinfo = G_APP_INFO (g_desktop_app_info_new_from_filename (path));
content_types = g_app_info_get_supported_types (appinfo);
@@ -441,7 +441,7 @@ test_from_keyfile (void)
const gchar *name;
const gchar *path;
path = g_test_get_filename (G_TEST_DISTED, "appinfo-test.desktop", NULL);
path = g_test_get_filename (G_TEST_DIST, "appinfo-test.desktop", NULL);
kf = g_key_file_new ();
g_key_file_load_from_file (kf, path, G_KEY_FILE_NONE, &error);
g_assert_no_error (error);

2
gio/tests/contexts.c
View File

@@ -188,7 +188,7 @@ main (int argc, char **argv)
g_test_init (&argc, &argv, NULL);
test_file = g_test_build_filename (G_TEST_DISTED, "contexts.c", NULL);
test_file = g_test_build_filename (G_TEST_DIST, "contexts.c", NULL);
g_file_get_contents (test_file, &test_file_buffer,
&test_file_size, &error);
g_assert_no_error (error);

2
gio/tests/file.c
View File

@@ -84,7 +84,7 @@ test_type (void)
GFileType type;
GError *error = NULL;
datapath_f = g_file_new_for_path (g_test_get_dir (G_TEST_DISTED));
datapath_f = g_file_new_for_path (g_test_get_dir (G_TEST_DIST));
file = g_file_get_child (datapath_f, "g-icon.c");
type = g_file_query_file_type (file, 0, NULL);

2
gio/tests/g-icon.c
View File

@@ -466,7 +466,7 @@ test_file_icon (void)
GInputStream *stream;
gchar *str;
file = g_file_new_for_path (g_test_get_filename (G_TEST_DISTED, "g-icon.c", NULL));
file = g_file_new_for_path (g_test_get_filename (G_TEST_DIST, "g-icon.c", NULL));
icon = g_file_icon_new (file);
g_object_unref (file);

2
gio/tests/gdbus-peer.c
View File

@@ -787,7 +787,7 @@ test_peer (void)
gsize len;
gchar *buf2;
gsize len2;
const char *testfile = g_test_get_filename (G_TEST_DISTED, "file.c", NULL);
const char *testfile = g_test_get_filename (G_TEST_DIST, "file.c", NULL);
method_call_message = g_dbus_message_new_method_call (NULL, /* name */
"/org/gtk/GDBus/PeerTestObject",

2
gio/tests/gschema-compile.c
View File

@@ -18,7 +18,7 @@ test_schema_do_compile (gpointer data)
{
SchemaTest *test = (SchemaTest *) data;
gchar *filename = g_strconcat (test->name, ".gschema.xml", NULL);
gchar *path = g_test_build_filename (G_TEST_DISTED, "schema-tests", filename, NULL);
gchar *path = g_test_build_filename (G_TEST_DIST, "schema-tests", filename, NULL);
gchar *argv[] = {
(gchar*)glib_compile_schemas,
"--strict",

8
gio/tests/gsettings.c
View File

@@ -2257,7 +2257,7 @@ main (int argc, char *argv[])
backend_set = g_getenv ("GSETTINGS_BACKEND") != NULL;
g_setenv ("XDG_DATA_DIRS", g_test_get_dir (G_TEST_DISTED), TRUE);
g_setenv ("XDG_DATA_DIRS", g_test_get_dir (G_TEST_DIST), TRUE);
g_setenv ("GSETTINGS_SCHEMA_DIR", ".", TRUE);
if (!backend_set)
@@ -2269,7 +2269,7 @@ main (int argc, char *argv[])
glib_mkenums = "glib-mkenums";
cmdline = g_strdup_printf ("%s --template %s/enums.xml.template %s/testenum.h", glib_mkenums,
g_test_get_dir (G_TEST_DISTED), g_test_get_dir (G_TEST_DISTED));
g_test_get_dir (G_TEST_DIST), g_test_get_dir (G_TEST_DIST));
g_assert (g_spawn_command_line_sync (cmdline, &enums, NULL, &result, NULL));
g_assert (result == 0);
@@ -2283,7 +2283,7 @@ main (int argc, char *argv[])
else
glib_compile_schemas = "glib-compile-schemas";
cmdline = g_strdup_printf ("%s --targetdir=. --schema-file=org.gtk.test.enums.xml --schema-file=%s/org.gtk.test.gschema.xml", glib_compile_schemas, g_test_get_dir (G_TEST_DISTED));
cmdline = g_strdup_printf ("%s --targetdir=. --schema-file=org.gtk.test.enums.xml --schema-file=%s/org.gtk.test.gschema.xml", glib_compile_schemas, g_test_get_dir (G_TEST_DIST));
g_assert (g_spawn_command_line_sync (cmdline, NULL, NULL, &result, NULL));
g_assert (result == 0);
g_free (cmdline);
@@ -2291,7 +2291,7 @@ main (int argc, char *argv[])
g_mkdir ("schema-source", 0777);
g_remove ("schema-source/gschemas.compiled");
cmdline = g_strdup_printf ("%s --targetdir=schema-source --schema-file=%s/org.gtk.schemasourcecheck.gschema.xml", glib_compile_schemas, g_test_get_dir (G_TEST_DISTED));
cmdline = g_strdup_printf ("%s --targetdir=schema-source --schema-file=%s/org.gtk.schemasourcecheck.gschema.xml", glib_compile_schemas, g_test_get_dir (G_TEST_DIST));
g_assert (g_spawn_command_line_sync (cmdline, NULL, NULL, &result, NULL));
g_assert (result == 0);
g_free (cmdline);

44
gio/tests/tls-certificate.c
View File

@@ -43,7 +43,7 @@ pem_parser (const Reference *ref)
GError *error = NULL;
/* Check PEM parsing in certificate, private key order. */
g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert-key.pem", NULL), &pem, NULL, &error);
g_file_get_contents (g_test_get_filename (G_TEST_DIST, "cert-tests", "cert-key.pem", NULL), &pem, NULL, &error);
g_assert_no_error (error);
g_assert (pem);
@@ -70,7 +70,7 @@ pem_parser (const Reference *ref)
g_free (pem);
/* Check PEM parsing in private key, certificate order */
g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL), &pem, NULL, &error);
g_file_get_contents (g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem", NULL), &pem, NULL, &error);
g_assert_no_error (error);
g_assert (pem);
@@ -92,7 +92,7 @@ pem_parser (const Reference *ref)
g_object_unref (cert);
/* Check certificate only PEM */
g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL), &pem, NULL, &error);
g_file_get_contents (g_test_get_filename (G_TEST_DIST, "cert-tests", "cert1.pem", NULL), &pem, NULL, &error);
g_assert_no_error (error);
g_assert (pem);
@@ -113,7 +113,7 @@ pem_parser (const Reference *ref)
g_object_unref (cert);
/* Check error with private key only PEM */
g_file_get_contents (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL), &pem, NULL, &error);
g_file_get_contents (g_test_get_filename (G_TEST_DIST, "cert-tests", "key.pem", NULL), &pem, NULL, &error);
g_assert_no_error (error);
g_assert (pem);
@@ -132,7 +132,7 @@ from_file (const Reference *ref)
const gchar *parsed_key_pem = NULL;
GError *error = NULL;
cert = g_tls_certificate_new_from_file (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL),
cert = g_tls_certificate_new_from_file (g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem", NULL),
&error);
g_assert_no_error (error);
g_assert (cert);
@@ -158,8 +158,8 @@ from_files (const Reference *ref)
const gchar *parsed_key_pem = NULL;
GError *error = NULL;
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL),
g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL),
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "cert1.pem", NULL),
g_test_get_filename (G_TEST_DIST, "cert-tests", "key.pem", NULL),
&error);
g_assert_no_error (error);
g_assert (cert);
@@ -177,16 +177,16 @@ from_files (const Reference *ref)
g_object_unref (cert);
/* Missing private key */
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL),
g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert2.pem", NULL),
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "cert1.pem", NULL),
g_test_get_filename (G_TEST_DIST, "cert-tests", "cert2.pem", NULL),
&error);
g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
g_clear_error (&error);
g_assert (cert == NULL);
/* Missing certificate */
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL),
g_test_get_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL),
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "key.pem", NULL),
g_test_get_filename (G_TEST_DIST, "cert-tests", "key.pem", NULL),
&error);
g_assert_error (error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
g_clear_error (&error);
@@ -195,8 +195,8 @@ from_files (const Reference *ref)
/* Using this method twice with a file containing both private key and
* certificate as a way to inforce private key presence is a fair use
*/
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL),
g_test_get_filename (G_TEST_DISTED, "cert-tests", "key-cert.pem", NULL),
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem", NULL),
g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem", NULL),
&error);
g_assert_no_error (error);
g_assert (cert);
@@ -212,8 +212,8 @@ from_files_pkcs8 (const Reference *ref)
const gchar *parsed_key_pem = NULL;
GError *error = NULL;
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL),
g_test_get_filename (G_TEST_DISTED, "cert-tests", "key8.pem", NULL),
cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "cert1.pem", NULL),
g_test_get_filename (G_TEST_DIST, "cert-tests", "key8.pem", NULL),
&error);
g_assert_no_error (error);
g_assert (cert);
@@ -238,7 +238,7 @@ list_from_file (const Reference *ref)
GError *error = NULL;
int i;
list = g_tls_certificate_list_new_from_file (g_test_get_filename (G_TEST_DISTED, "cert-tests", "cert-list.pem", NULL),
list = g_tls_certificate_list_new_from_file (g_test_get_filename (G_TEST_DIST, "cert-tests", "cert-list.pem", NULL),
&error);
g_assert_no_error (error);
g_assert_cmpint (g_list_length (list), ==, 3);
@@ -259,7 +259,7 @@ list_from_file (const Reference *ref)
g_list_free_full (list, g_object_unref);
/* Empty list is not an error */
list = g_tls_certificate_list_new_from_file (g_test_get_filename (G_TEST_DISTED, "cert-tests", "nothing.pem", NULL),
list = g_tls_certificate_list_new_from_file (g_test_get_filename (G_TEST_DIST, "cert-tests", "nothing.pem", NULL),
&error);
g_assert_no_error (error);
g_assert_cmpint (g_list_length (list), ==, 0);
@@ -279,27 +279,27 @@ main (int argc,
_g_test_tls_backend_get_type ();
/* Load reference PEM */
path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert1.pem", NULL);
path = g_test_build_filename (G_TEST_DIST, "cert-tests", "cert1.pem", NULL);
g_file_get_contents (path, &ref.cert_pems[0], NULL, &error);
g_assert_no_error (error);
g_assert (ref.cert_pems[0]);
g_free (path);
path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert2.pem", NULL);
path = g_test_build_filename (G_TEST_DIST, "cert-tests", "cert2.pem", NULL);
g_file_get_contents (path, &ref.cert_pems[1], NULL, &error);
g_assert_no_error (error);
g_assert (ref.cert_pems[1]);
g_free (path);
path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "cert3.pem", NULL);
path = g_test_build_filename (G_TEST_DIST, "cert-tests", "cert3.pem", NULL);
g_file_get_contents (path, &ref.cert_pems[2], NULL, &error);
g_assert_no_error (error);
g_assert (ref.cert_pems[2]);
g_free (path);
path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key.pem", NULL);
path = g_test_build_filename (G_TEST_DIST, "cert-tests", "key.pem", NULL);
g_file_get_contents (path, &ref.key_pem, NULL, &error);
g_assert_no_error (error);
g_assert (ref.key_pem);
g_free (path);
path = g_test_build_filename (G_TEST_DISTED, "cert-tests", "key8.pem", NULL);
path = g_test_build_filename (G_TEST_DIST, "cert-tests", "key8.pem", NULL);
g_file_get_contents (path, &ref.key8_pem, NULL, &error);
g_assert_no_error (error);
g_assert (ref.key8_pem);