diff options
| author | Stef Walter <stefw@redhat.com> | 2014-09-03 10:10:11 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@redhat.com> | 2014-09-03 11:13:43 +0200 |
| commit | 6ee9bb7e551bd86c4dd829e7660b39efdf186549 (patch) | |
| tree | caf0cbd053b25b94d4e7aadad7b10544141fe628 /egg | |
| parent | b9e365d0f5ddb43d9ebd3e7b33bd28a9b3ea741b (diff) | |
| download | gcr-6ee9bb7e551bd86c4dd829e7660b39efdf186549.tar.gz | |
configure: Dump required GLib version to 2.38
We want to use 2.38.x and 2.36.x APIs in the GcrSshAskpass code
and the 2.38.x has been available in most distributions for a while.
Diffstat (limited to 'egg')
| -rw-r--r-- | egg/egg-testing.c | 4 | ||||
| -rw-r--r-- | egg/test-asn1.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/egg/egg-testing.c b/egg/egg-testing.c index df6e4ee..6ca46a8 100644 --- a/egg/egg-testing.c +++ b/egg/egg-testing.c @@ -237,10 +237,6 @@ egg_tests_run_with_loop (void) GMainLoop *loop; gpointer ret; -#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -#endif - loop = g_main_loop_new (NULL, FALSE); wait_condition = g_cond_new (); wait_start = g_cond_new (); diff --git a/egg/test-asn1.c b/egg/test-asn1.c index 883c92b..e0921b8 100644 --- a/egg/test-asn1.c +++ b/egg/test-asn1.c @@ -391,11 +391,12 @@ test_integer_raw_not_twos_complement (void) bytes = g_bytes_new_static ("\x81\x02\x03", 3); - if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR)) { + if (g_test_subprocess ()) { egg_asn1x_set_integer_as_raw (asn, bytes); /* UNREACHABLE: */ - exit(0); /* UNREACHABLE: for code coverage */ + return; } + g_test_trap_subprocess ("/asn1/integer/raw-not-twos-complement", 0, G_TEST_SUBPROCESS_INHERIT_STDOUT); g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*not two's complement*"); |