From 6518e361171f64bcaaa4bf868139362ed95cc2e0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 20 Oct 2018 01:30:31 +0200 Subject: New upstream version 1.14.2 --- libnm/tests/meson.build | 2 +- libnm/tests/test-secret-agent.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libnm/tests') diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index e2b88273..27fafb77 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -8,7 +8,7 @@ test_units = [ cflags = [ '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM', -] + nm_build_cflags +] foreach test_unit: test_units exe = executable( diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 746a9e64..53110be6 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -111,8 +111,8 @@ done: static void test_secret_agent_cancel_get_secrets (NMSecretAgentOld *agent, - const gchar *connection_path, - const gchar *setting_name) + const char *connection_path, + const char *setting_name) { g_assert_not_reached (); } @@ -120,7 +120,7 @@ test_secret_agent_cancel_get_secrets (NMSecretAgentOld *agent, static void test_secret_agent_save_secrets (NMSecretAgentOld *agent, NMConnection *connection, - const gchar *connection_path, + const char *connection_path, NMSecretAgentOldSaveSecretsFunc callback, gpointer callback_data) { @@ -130,7 +130,7 @@ test_secret_agent_save_secrets (NMSecretAgentOld *agent, static void test_secret_agent_delete_secrets (NMSecretAgentOld *agent, NMConnection *connection, - const gchar *connection_path, + const char *connection_path, NMSecretAgentOldDeleteSecretsFunc callback, gpointer callback_data) { -- cgit 1.3.0-6-gf8a5 From 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Oct 2018 21:01:12 +0200 Subject: New upstream version 1.14.4 --- libnm/tests/meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libnm/tests') diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index 27fafb77..ae2f7124 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -1,8 +1,8 @@ test_units = [ - ['test-general', [libnm_utils, libnm_core]], - ['test-nm-client', []], - ['test-remote-settings-client', []], - ['test-secret-agent', []], + ['test-general', [libnm_utils, libnm_core], 30], + ['test-nm-client', [], 90], + ['test-remote-settings-client', [], 90], + ['test-secret-agent', [], 90], ] cflags = [ @@ -28,6 +28,7 @@ foreach test_unit: test_units test( 'libnm/' + test_unit[0], test_script, + timeout: test_unit[2], args: test_args + [exe.full_path()] ) endforeach -- cgit 1.3.0-6-gf8a5