Revision: 21151
http://gar.svn.sourceforge.net/gar/?rev=21151&view=rev
Author: lblume
Date: 2013-05-20 12:58:53 +0000 (Mon, 20 May 2013)
Log Message:
-----------
glib2/trunk: Make a patch amd64-only to avoid conflicting with sparc-only
patches
Modified Paths:
--------------
csw/mgar/pkg/glib2/trunk/Makefile
csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch
Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile 2013-05-20 07:33:18 UTC (rev 21150)
+++ csw/mgar/pkg/glib2/trunk/Makefile 2013-05-20 12:58:53 UTC (rev 21151)
@@ -87,7 +87,7 @@
PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch
# What to say? Disable yet another sporadically failing up test
-PATCHFILES += 0023-disable-mainloop-invoke-test.patch
+PATCHFILES_isa-amd64 += 0023-disable-mainloop-invoke-test.patch
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
Modified: csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch
2013-05-20 07:33:18 UTC (rev 21150)
+++ csw/mgar/pkg/glib2/trunk/files/0023-disable-mainloop-invoke-test.patch
2013-05-20 12:58:53 UTC (rev 21151)
@@ -1,12 +1,12 @@
--- a/glib/tests/mainloop.c.original Sat Jul 14 22:33:18 2012
-+++ b/glib/tests/mainloop.c Sun May 19 23:58:20 2013
++++ b/glib/tests/mainloop.c Mon May 20 10:46:38 2013
@@ -477,7 +477,8 @@
g_test_add_func ("/mainloop/basic", test_mainloop_basic);
g_test_add_func ("/mainloop/timeouts", test_timeouts);
g_test_add_func ("/mainloop/priorities", test_priorities);
- g_test_add_func ("/mainloop/invoke", test_invoke);
-+/* Fails sporadically on amd64, disabled */
-+/* g_test_add_func ("/mainloop/invoke", test_invoke); */
++/* g_test_add_func ("/mainloop/invoke", test_invoke); */ /* Fails
sporadically
++ on amd64, disabled */
g_test_add_func ("/mainloop/child_sources", test_child_sources);
g_test_add_func ("/mainloop/recursive_child_sources",
test_recursive_child_sources);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
