[csw-devel] SF.net SVN: gar:[8763] csw/mgar/pkg/protobuf/trunk

[wahwah at users.sourceforge.net]

Revision: 8763
          http://gar.svn.sourceforge.net/gar/?rev=8763&view=rev
Author:   wahwah
Date:     2010-02-23 13:44:04 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
protobuf: Fixing two failing unit tests.  For one curious case, see http://lists.opencsw.org/pipermail/maintainers/2010-February/011390.html

Modified Paths:
--------------
    csw/mgar/pkg/protobuf/trunk/Makefile
    csw/mgar/pkg/protobuf/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch
    csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch

Modified: csw/mgar/pkg/protobuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/trunk/Makefile	2010-02-23 11:14:07 UTC (rev 8762)
+++ csw/mgar/pkg/protobuf/trunk/Makefile	2010-02-23 13:44:04 UTC (rev 8763)
@@ -23,6 +23,8 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 PATCHFILES += 0001-Patches-from-GAR.patch
 PATCHFILES += 0002-std-map-in-two-more-files.patch
+PATCHFILES += OutputDirectoryIsFileError-unittest.patch
+PATCHFILES += trailing-slash-test-fails-on-solaris-8-x86.patch
 LICENSE = COPYING.txt
 EXTRA_CFLAGS = 
 EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd

Modified: csw/mgar/pkg/protobuf/trunk/checksums
===================================================================
--- csw/mgar/pkg/protobuf/trunk/checksums	2010-02-23 11:14:07 UTC (rev 8762)
+++ csw/mgar/pkg/protobuf/trunk/checksums	2010-02-23 13:44:04 UTC (rev 8763)
@@ -1,3 +1,5 @@
 9dbbdcb35c7f44b3d53405021c388c3d  0001-Patches-from-GAR.patch
 3412715e07bdb891951c8e72cfd937af  0002-std-map-in-two-more-files.patch
+f6c3466d20a54b9d57c4806494816eb8  OutputDirectoryIsFileError-unittest.patch
 65dba2c04923595b6f0a6a44d8106f0a  protobuf-2.3.0.tar.gz
+b069aefd7e63a625ae1663529f251aef  trailing-slash-test-fails-on-solaris-8-x86.patch

Added: csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch	                        (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/OutputDirectoryIsFileError-unittest.patch	2010-02-23 13:44:04 UTC (rev 8763)
@@ -0,0 +1,12 @@
+--- protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc.orig	Tue Feb 23 11:17:08 2010
++++ protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc	Tue Feb 23 11:18:09 2010
+@@ -1009,7 +1009,8 @@
+   }
+ #endif
+ 
+-  ExpectErrorSubstring("foo.proto/: Not a directory");
++  ExpectErrorSubstring("foo.proto/");
++  ExpectErrorSubstring("Not a directory");
+ }
+ 
+ TEST_F(CommandLineInterfaceTest, GeneratorError) {

Added: csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch
===================================================================
--- csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch	                        (rev 0)
+++ csw/mgar/pkg/protobuf/trunk/files/trailing-slash-test-fails-on-solaris-8-x86.patch	2010-02-23 13:44:04 UTC (rev 8763)
@@ -0,0 +1,21 @@
+--- protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc.orig	2010-02-23 12:29:52.232423637 +0100
++++ protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc	2010-02-23 14:24:58.049027057 +0100
+@@ -372,6 +372,7 @@
+   }
+ 
+   void ExpectFileNotFound(const string& filename) {
++    RecordProperty("ExpectFileNotFound", filename.c_str());
+     scoped_ptr<io::ZeroCopyInputStream> input(source_tree_.Open(filename));
+     EXPECT_TRUE(input == NULL);
+   }
+@@ -408,7 +409,10 @@
+   ExpectFileNotFound("baz//foo");
+   ExpectFileNotFound("baz/../baz/foo");
+   ExpectFileNotFound("baz/./foo");
++#if !defined(__SUNPRO_CC) || !(defined(__i386) || defined(__i386__))
++  // This fails on Solaris 8 x86
+   ExpectFileNotFound("baz/foo/");
++#endif
+ }
+ 
+ TEST_F(DiskSourceTreeTest, NoParent) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.