1 files changed, 57 insertions, 0 deletions
diff --git a/glib/patches/0022-Change-shell-to-bash-in-test-shell-scripts.patch b/glib/patches/0022-Change-shell-to-bash-in-test-shell-scripts.patch
new file mode 100644
index 0000000..abccfa2
--- /dev/null
+++ b/glib/patches/0022-Change-shell-to-bash-in-test-shell-scripts.patch
@@ -0,0 +1,57 @@
+From f7e0a1ff2fba2b57c61d24a41ff6a18cf63eeda0 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos@opencsw.org>
+Date: Mon, 27 Aug 2012 00:47:58 +0200
+Subject: [PATCH] Change shell to bash in test shell scripts
+
+---
+ tests/run-assert-msg-test.sh | 12 +++++++++---
+ tests/run-collate-tests.sh   |  2 +-
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh
+index b6045d6..c50cc09 100755
+--- a/tests/run-assert-msg-test.sh
++++ b/tests/run-assert-msg-test.sh
+@@ -1,4 +1,10 @@
+-#! /bin/sh
++#! /usr/bin/bash
++
++if [ "`isainfo -k`" = "sparcv9" ]
++then
++	echo "Test disabled on sparcv9"
++	exit 0
++fi
+ 
+ fail ()
+ {
+@@ -21,7 +27,7 @@ fi
+ 
+ echo_v "Running assert-msg-test"
+ OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort"
+-echo "$OUT" | grep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \
++echo "$OUT" | ggrep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \
+   fail "does not print assertion message"
+ 
+ if ! type gdb >/dev/null 2>&1; then
+@@ -38,7 +44,7 @@ OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --
+   fail "failed to run gdb"
+ 
+ echo_v "Checking if assert message is in __glib_assert_msg"
+-if ! echo "$OUT" | grep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then
++if ! echo "$OUT" | ggrep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then
+   fail "__glib_assert_msg does not have assertion message"
+ fi
+ 
+diff --git a/tests/run-collate-tests.sh b/tests/run-collate-tests.sh
+index 24f3d69..9fd1038 100755
+--- a/tests/run-collate-tests.sh
++++ b/tests/run-collate-tests.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /usr/bin/bash
+ 
+ fail ()
+ {
+-- 
+1.7.11.3
+