diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
| commit | 1f85f9683a41ca116af20fd19940576040303080 (patch) | |
| tree | 54c4ac337fe0b0091772b7ef6a22c715dd985fab /libnm/tests | |
| parent | eca0cfe89a2a7ec88abe9c03075160f46b338137 (diff) | |
| parent | 5554398639fa9e344bd12205a64874e6436b936e (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'libnm/tests')
| -rw-r--r-- | libnm/tests/meson.build | 2 | ||||
| -rw-r--r-- | libnm/tests/test-secret-agent.c | 8 |
2 files changed, 5 insertions, 5 deletions
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) { |