Parcourir la source

Exclude a failing test in MingW build.

xiaofeng@google.com il y a 12 ans
Parent
commit
a36f1b43e7
2 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 2 1
      python/README.txt
  2. 2 2
      src/google/protobuf/stubs/stringprintf_unittest.cc

+ 2 - 1
python/README.txt

@@ -43,8 +43,9 @@ Installation
 
 
      $ protoc --version
      $ protoc --version
 
 
-4) Run the tests:
+4) Build and run the tests:
 
 
+     $ python setup.py build
      $ python setup.py test
      $ python setup.py test
 
 
    If some tests fail, this library may not work correctly on your
    If some tests fail, this library may not work correctly on your

+ 2 - 2
src/google/protobuf/stubs/stringprintf_unittest.cc

@@ -54,8 +54,8 @@ TEST(StringPrintfTest, Empty) {
 }
 }
 
 
 TEST(StringPrintfTest, Misc) {
 TEST(StringPrintfTest, Misc) {
-// MSVC does not support $ format specifier.
-#if !defined(_MSC_VER)
+// MSVC and mingw does not support $ format specifier.
+#if !defined(_MSC_VER) && !defined(__MINGW32__)
   EXPECT_EQ("123hello w", StringPrintf("%3$d%2$s %1$c", 'w', "hello", 123));
   EXPECT_EQ("123hello w", StringPrintf("%3$d%2$s %1$c", 'w', "hello", 123));
 #endif  // !_MSC_VER
 #endif  // !_MSC_VER
 }
 }