diff options
| author | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-02-26 17:49:03 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2013-02-26 17:49:03 +0000 |
| commit | a36f1b43e738a7f5e40ab11b621803d684c3d65a (patch) | |
| tree | 84477aee857e87aa1dfaf06db25f331e3f5639bc | |
| parent | 7f372559cc31f15e8c30694ee7329bc0082454fe (diff) | |
| download | protobuf-a36f1b43e738a7f5e40ab11b621803d684c3d65a.tar.gz protobuf-a36f1b43e738a7f5e40ab11b621803d684c3d65a.tar.bz2 protobuf-a36f1b43e738a7f5e40ab11b621803d684c3d65a.zip | |
Exclude a failing test in MingW build.
| -rw-r--r-- | python/README.txt | 3 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/stringprintf_unittest.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/python/README.txt b/python/README.txt index 6dc144e9..bb0032fe 100644 --- a/python/README.txt +++ b/python/README.txt @@ -43,8 +43,9 @@ Installation $ protoc --version -4) Run the tests: +4) Build and run the tests: + $ python setup.py build $ python setup.py test If some tests fail, this library may not work correctly on your diff --git a/src/google/protobuf/stubs/stringprintf_unittest.cc b/src/google/protobuf/stubs/stringprintf_unittest.cc index a78a2027..de5ce59f 100644 --- a/src/google/protobuf/stubs/stringprintf_unittest.cc +++ b/src/google/protobuf/stubs/stringprintf_unittest.cc @@ -54,8 +54,8 @@ TEST(StringPrintfTest, Empty) { } 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)); #endif // !_MSC_VER } |