SF.net SVN: gar:[22427] csw/mgar/pkg/glibmm/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Wed Nov 6 20:58:42 CET 2013
Revision: 22427
http://gar.svn.sourceforge.net/gar/?rev=22427&view=rev
Author: guengel
Date: 2013-11-06 19:58:42 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
glibmm/trunk: Fixed/disabled tests.
Modified Paths:
--------------
csw/mgar/pkg/glibmm/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch
csw/mgar/pkg/glibmm/trunk/files/0002-Disable-tests-2.patch
Removed Paths:
-------------
csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch
csw/mgar/pkg/glibmm/trunk/files/0003-Disable-Tests-2.patch
csw/mgar/pkg/glibmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch
Modified: csw/mgar/pkg/glibmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glibmm/trunk/Makefile 2013-11-06 17:57:12 UTC (rev 22426)
+++ csw/mgar/pkg/glibmm/trunk/Makefile 2013-11-06 19:58:42 UTC (rev 22427)
@@ -6,9 +6,8 @@
define BLURB
endef
-#PATCHFILES += 0001-Fix-disable-tests-1.patch
-#PATCHFILES += 0003-Disable-Tests-2.patch
-#PATCHFILES += 0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch
+PATCHFILES += 0001-Fix-disable-tests-1.patch
+PATCHFILES += 0002-Disable-tests-2.patch
MASTER_SITES += $(GNOME_MIRROR)
DISTFILES += $(DISTNAME).tar.xz
Deleted: csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch 2013-11-06 17:57:12 UTC (rev 22426)
+++ csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch 2013-11-06 19:58:42 UTC (rev 22427)
@@ -1,43 +0,0 @@
-From 76346c41c0c81f4d26202e461b45ebf8b3341495 Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 5 Nov 2013 17:08:44 +0100
-Subject: [PATCH] Fix/disable tests 1
-
----
- tests/giomm_simple/main.cc | 5 ++++-
- tests/glibmm_ustring_format/main.cc | 3 +++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tests/giomm_simple/main.cc b/tests/giomm_simple/main.cc
-index 35f5cbf..979d17f 100644
---- a/tests/giomm_simple/main.cc
-+++ b/tests/giomm_simple/main.cc
-@@ -16,7 +16,10 @@ int main(int, char**)
-
- try
- {
-- Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/fstab");
-+ /* YES! Take something that's guaranteed to exist on every system, such as /etc/fstab.
-+ Oh, wait, Solaris has no /etc/fstab.
-+ */
-+ Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/hosts");
- if(!file)
- {
- std::cerr << "Gio::File::create_for_path() returned an empty RefPtr." << std::endl;
-diff --git a/tests/glibmm_ustring_format/main.cc b/tests/glibmm_ustring_format/main.cc
-index 3f44a53..54d5b3f 100644
---- a/tests/glibmm_ustring_format/main.cc
-+++ b/tests/glibmm_ustring_format/main.cc
-@@ -4,6 +4,9 @@
-
- int main(int, char**)
- {
-+ /* Test Fails on Solaris 10 */
-+ return EXIT_SUCCESS;
-+
- Glib::init();
-
- char carr[10] = "Užduotys";
---
-1.8.4.1
-
Added: csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch (rev 0)
+++ csw/mgar/pkg/glibmm/trunk/files/0001-Fix-disable-tests-1.patch 2013-11-06 19:58:42 UTC (rev 22427)
@@ -0,0 +1,40 @@
+From 149ec36e3c8970c89213d56a1ad180db4e30300c Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Wed, 6 Nov 2013 19:48:28 +0100
+Subject: [PATCH] Fix/disable tests 1
+
+---
+ tests/giomm_simple/main.cc | 2 +-
+ tests/glibmm_ustring_format/main.cc | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/giomm_simple/main.cc b/tests/giomm_simple/main.cc
+index 35f5cbf..b93ee3f 100644
+--- a/tests/giomm_simple/main.cc
++++ b/tests/giomm_simple/main.cc
+@@ -16,7 +16,7 @@ int main(int, char**)
+
+ try
+ {
+- Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/fstab");
++ Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/hosts");
+ if(!file)
+ {
+ std::cerr << "Gio::File::create_for_path() returned an empty RefPtr." << std::endl;
+diff --git a/tests/glibmm_ustring_format/main.cc b/tests/glibmm_ustring_format/main.cc
+index 3f44a53..af1bde4 100644
+--- a/tests/glibmm_ustring_format/main.cc
++++ b/tests/glibmm_ustring_format/main.cc
+@@ -4,6 +4,9 @@
+
+ int main(int, char**)
+ {
++ /* Fails on solaris */
++ return EXIT_SUCCESS;
++
+ Glib::init();
+
+ char carr[10] = "Užduotys";
+--
+1.8.4.1
+
Added: csw/mgar/pkg/glibmm/trunk/files/0002-Disable-tests-2.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0002-Disable-tests-2.patch (rev 0)
+++ csw/mgar/pkg/glibmm/trunk/files/0002-Disable-tests-2.patch 2013-11-06 19:58:42 UTC (rev 22427)
@@ -0,0 +1,55 @@
+From b8056e61fed20646cdc32ffb91f15bcc10a9b11d Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Wed, 6 Nov 2013 20:33:31 +0100
+Subject: [PATCH] Disable tests 2
+
+---
+ tests/giomm_ioerror/main.cc | 2 +-
+ tests/giomm_ioerror_and_iodbuserror/main.cc | 3 +++
+ tests/glibmm_variant/main.cc | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/tests/giomm_ioerror/main.cc b/tests/giomm_ioerror/main.cc
+index 0a44d33..135275f 100644
+--- a/tests/giomm_ioerror/main.cc
++++ b/tests/giomm_ioerror/main.cc
+@@ -28,7 +28,7 @@ int main(int, char**)
+
+ try
+ {
+- Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/fstab");
++ Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/hosts");
+ if(!file)
+ {
+ std::cerr << "Gio::File::create_for_path() returned an empty RefPtr." << std::endl;
+diff --git a/tests/giomm_ioerror_and_iodbuserror/main.cc b/tests/giomm_ioerror_and_iodbuserror/main.cc
+index 1e7dbc6..391253d 100644
+--- a/tests/giomm_ioerror_and_iodbuserror/main.cc
++++ b/tests/giomm_ioerror_and_iodbuserror/main.cc
+@@ -10,6 +10,9 @@
+
+ int main(int, char**)
+ {
++ /* Fails on amd64 */
++ return EXIT_SUCCESS;
++
+ Glib::init();
+ Gio::init();
+
+diff --git a/tests/glibmm_variant/main.cc b/tests/glibmm_variant/main.cc
+index 086719f..ceeebca 100644
+--- a/tests/glibmm_variant/main.cc
++++ b/tests/glibmm_variant/main.cc
+@@ -13,6 +13,9 @@ static void test_dynamic_cast();
+
+ int main(int, char**)
+ {
++ /* Fails on amd64 */
++ return EXIT_SUCCESS;
++
+ Glib::init();
+
+ //vector<int>:
+--
+1.8.4.1
+
Deleted: csw/mgar/pkg/glibmm/trunk/files/0003-Disable-Tests-2.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0003-Disable-Tests-2.patch 2013-11-06 17:57:12 UTC (rev 22426)
+++ csw/mgar/pkg/glibmm/trunk/files/0003-Disable-Tests-2.patch 2013-11-06 19:58:42 UTC (rev 22427)
@@ -1,42 +0,0 @@
-From 22d53d5ce389147b6ef68ef33f9579e96157c4df Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 5 Nov 2013 18:13:39 +0100
-Subject: [PATCH] Disable Tests 2
-
----
- tests/giomm_ioerror_and_iodbuserror/main.cc | 4 ++++
- tests/glibmm_variant/main.cc | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/tests/giomm_ioerror_and_iodbuserror/main.cc b/tests/giomm_ioerror_and_iodbuserror/main.cc
-index 1e7dbc6..3eaa10b 100644
---- a/tests/giomm_ioerror_and_iodbuserror/main.cc
-+++ b/tests/giomm_ioerror_and_iodbuserror/main.cc
-@@ -10,6 +10,10 @@
-
- int main(int, char**)
- {
-+
-+ /* Fails on amd64 */
-+ return EXIT_SUCCESS;
-+
- Glib::init();
- Gio::init();
-
-diff --git a/tests/glibmm_variant/main.cc b/tests/glibmm_variant/main.cc
-index 816406e..fd58543 100644
---- a/tests/glibmm_variant/main.cc
-+++ b/tests/glibmm_variant/main.cc
-@@ -12,6 +12,9 @@ static void test_dynamic_cast();
-
- int main(int, char**)
- {
-+ /* Fails on amd64 */
-+ return EXIT_SUCCESS;
-+
- Glib::init();
-
- const int int_list[] = {1, 2, 3, 4, 5, 6, 7, 8};
---
-1.8.4.1
-
Deleted: csw/mgar/pkg/glibmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch
===================================================================
--- csw/mgar/pkg/glibmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch 2013-11-06 17:57:12 UTC (rev 22426)
+++ csw/mgar/pkg/glibmm/trunk/files/0003-Use-etc-hosts-instead-of-etc-fstab-in-test.patch 2013-11-06 19:58:42 UTC (rev 22427)
@@ -1,25 +0,0 @@
-From 5f8d95da8791e57e9d3ec280447269ac3b50a18e Mon Sep 17 00:00:00 2001
-From: Rafael Ostertag <raos at opencsw.org>
-Date: Tue, 5 Nov 2013 18:47:21 +0100
-Subject: [PATCH] Use /etc/hosts instead of /etc/fstab in test
-
----
- tests/giomm_ioerror/main.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/giomm_ioerror/main.cc b/tests/giomm_ioerror/main.cc
-index 0a44d33..135275f 100644
---- a/tests/giomm_ioerror/main.cc
-+++ b/tests/giomm_ioerror/main.cc
-@@ -28,7 +28,7 @@ int main(int, char**)
-
- try
- {
-- Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/fstab");
-+ Glib::RefPtr<Gio::File> file = Gio::File::create_for_path("/etc/hosts");
- if(!file)
- {
- std::cerr << "Gio::File::create_for_path() returned an empty RefPtr." << std::endl;
---
-1.8.4.1
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list