diff options
Diffstat (limited to 'dev-libs/glib/files/glib-2.24-assert-test-failure.patch')
-rw-r--r-- | dev-libs/glib/files/glib-2.24-assert-test-failure.patch | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch index 6d8e74f3..1c68b7b3 100644 --- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch +++ b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch @@ -1,12 +1,3 @@ -Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed -because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This -causes gdb to use the system-wide glib instead, and fail on the test. - -This patch exports LD_LIBRARY_PATH before running gdb - -https://bugzilla.gnome.org/621368 - ---- --- tests/run-assert-msg-test.sh +++ tests/run-assert-msg-test.sh @@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then @@ -14,6 +5,6 @@ https://bugzilla.gnome.org/621368 fi echo_v "Running gdb on assert-msg-test" +export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH" - OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \ + OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \ fail "failed to run gdb" |