[glib-networking] tests: Stop setting GIO_EXTRA_MODULES
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] tests: Stop setting GIO_EXTRA_MODULES
- Date: Sun, 15 Apr 2018 15:47:57 +0000 (UTC)
commit ba4f23fd2df7c8a664ecbbfb381d22548e99730c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Apr 15 10:46:14 2018 -0500
tests: Stop setting GIO_EXTRA_MODULES
It's pointing to a libtool directory that isn't created anymore. This is
handled nowadays by setting GIO_MODULE_DIR in the test environment.
proxy/tests/gnome.c | 1 -
proxy/tests/libproxy.c | 3 ---
tls/tests/certificate.c | 1 -
tls/tests/connection.c | 1 -
tls/tests/dtls-connection.c | 1 -
tls/tests/file-database.c | 1 -
6 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/proxy/tests/gnome.c b/proxy/tests/gnome.c
index 6603db3..f76b094 100644
--- a/proxy/tests/gnome.c
+++ b/proxy/tests/gnome.c
@@ -160,7 +160,6 @@ main (int argc,
{
g_test_init (&argc, &argv, NULL);
- g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/proxy/gnome/.libs", TRUE);
g_setenv ("GIO_USE_PROXY_RESOLVER", "gnome", TRUE);
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
g_setenv ("XDG_CURRENT_DESKTOP", "GNOME", TRUE);
diff --git a/proxy/tests/libproxy.c b/proxy/tests/libproxy.c
index 9277291..e92ca81 100644
--- a/proxy/tests/libproxy.c
+++ b/proxy/tests/libproxy.c
@@ -82,9 +82,6 @@ main (int argc,
g_unsetenv ("DESKTOP_SESSION");
g_unsetenv ("KDE_FULL_SESSION");
- /* Use the just-built libproxy module */
- g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/proxy/libproxy/.libs", TRUE);
-
g_test_add_vtable ("/proxy/libproxy/uri", 0, NULL,
reset_proxy_settings, test_proxy_uri, NULL);
g_test_add_vtable ("/proxy/libproxy/socks", 0, NULL,
diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
index 69dfff1..cfd5176 100644
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -559,7 +559,6 @@ main (int argc,
g_test_init (&argc, &argv, NULL);
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
- g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
g_test_add ("/tls/certificate/create-pem", TestCertificate, NULL,
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 5560351..0ba907d 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -2140,7 +2140,6 @@ main (int argc,
g_test_bug_base ("http://bugzilla.gnome.org/");
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
- g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
g_test_add ("/tls/connection/basic", TestConnection, NULL,
diff --git a/tls/tests/dtls-connection.c b/tls/tests/dtls-connection.c
index 5f53134..b9a691c 100644
--- a/tls/tests/dtls-connection.c
+++ b/tls/tests/dtls-connection.c
@@ -783,7 +783,6 @@ main (int argc,
g_test_bug_base ("http://bugzilla.gnome.org/");
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
- g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
g_test_add ("/dtls/connection/basic/blocking", TestConnection, &blocking,
diff --git a/tls/tests/file-database.c b/tls/tests/file-database.c
index 57ac47e..3f01912 100644
--- a/tls/tests/file-database.c
+++ b/tls/tests/file-database.c
@@ -545,7 +545,6 @@ main (int argc,
g_test_init (&argc, &argv, NULL);
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
- g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/tls/gnutls/.libs", TRUE);
g_setenv ("GIO_USE_TLS", "gnutls", TRUE);
g_test_add_func ("/tls/backend/default-database-is-singleton",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]