diff options
Diffstat (limited to 'avro-cpp-boost160.patch')
| -rw-r--r-- | avro-cpp-boost160.patch | 152 |
1 files changed, 122 insertions, 30 deletions
diff --git a/avro-cpp-boost160.patch b/avro-cpp-boost160.patch index bae047b5538c..86d4229187a9 100644 --- a/avro-cpp-boost160.patch +++ b/avro-cpp-boost160.patch @@ -1,126 +1,218 @@ -diff -uNr -p1 src/avro-cpp-1.7.7/test/buffertest.cc src-bak/avro-cpp-1.7.7/test/buffertest.cc ---- src/avro-cpp-1.7.7/test/buffertest.cc 2014-07-18 20:20:04.000000000 +0100 -+++ src-bak/avro-cpp-1.7.7/test/buffertest.cc 2015-12-28 17:53:53.487075354 +0000 -@@ -66,3 +66,3 @@ void TestReserve() +diff -uNr avro-cpp-1.8.0.orig/test/buffertest.cc avro-cpp-1.8.0/test/buffertest.cc +--- avro-cpp-1.8.0.orig/test/buffertest.cc 2016-02-04 13:28:36.564240294 +0000 ++++ avro-cpp-1.8.0/test/buffertest.cc 2016-02-04 13:29:06.177573701 +0000 +@@ -64,7 +64,7 @@ + + void TestReserve() { - BOOST_MESSAGE( "TestReserve"); + BOOST_TEST_MESSAGE( "TestReserve"); { -@@ -113,3 +113,3 @@ void TestGrow() + OutputBuffer ob; + BOOST_CHECK_EQUAL(ob.size(), 0U); +@@ -111,7 +111,7 @@ + + void TestGrow() { - BOOST_MESSAGE( "TestGrow"); + BOOST_TEST_MESSAGE( "TestGrow"); { -@@ -153,3 +153,3 @@ void TestDiscard() + OutputBuffer ob; + +@@ -151,7 +151,7 @@ + + void TestDiscard() { - BOOST_MESSAGE( "TestDiscard"); + BOOST_TEST_MESSAGE( "TestDiscard"); { -@@ -259,3 +259,3 @@ void TestConvertToInput() + OutputBuffer ob; + size_t dataSize = kDefaultBlockSize*2 + kDefaultBlockSize/2; +@@ -257,7 +257,7 @@ + + void TestConvertToInput() { - BOOST_MESSAGE( "TestConvertToInput"); + BOOST_TEST_MESSAGE( "TestConvertToInput"); { -@@ -279,3 +279,3 @@ void TestExtractToInput() + OutputBuffer ob; + size_t dataSize = kDefaultBlockSize*2 + kDefaultBlockSize/2; +@@ -277,7 +277,7 @@ + + void TestExtractToInput() { - BOOST_MESSAGE( "TestExtractToInput"); + BOOST_TEST_MESSAGE( "TestExtractToInput"); { -@@ -378,3 +378,3 @@ void TestAppend() + OutputBuffer ob; + size_t dataSize = kDefaultBlockSize*2 + kDefaultBlockSize/2; +@@ -376,7 +376,7 @@ + + void TestAppend() { - BOOST_MESSAGE( "TestAppend"); + BOOST_TEST_MESSAGE( "TestAppend"); { -@@ -407,3 +407,3 @@ void TestBufferStream() + OutputBuffer ob; + size_t dataSize = kDefaultBlockSize + kDefaultBlockSize/2; +@@ -405,7 +405,7 @@ + + void TestBufferStream() { - BOOST_MESSAGE( "TestBufferStream"); + BOOST_TEST_MESSAGE( "TestBufferStream"); -@@ -458,3 +458,3 @@ void TestBufferStreamEof() + { + // write enough bytes to a buffer, to create at least 3 blocks +@@ -456,7 +456,7 @@ + + void TestBufferStreamEof() { - BOOST_MESSAGE( "TestBufferStreamEof"); + BOOST_TEST_MESSAGE( "TestBufferStreamEof"); -@@ -471,3 +471,3 @@ void TestSeekAndTell() + TestEof<int32_t>(); + +@@ -469,7 +469,7 @@ + + void TestSeekAndTell() { - BOOST_MESSAGE( "TestSeekAndTell"); + BOOST_TEST_MESSAGE( "TestSeekAndTell"); -@@ -503,3 +503,3 @@ void TestReadSome() + { + std::string junk = makeString(kDefaultBlockSize/2); +@@ -501,7 +501,7 @@ + + void TestReadSome() { - BOOST_MESSAGE( "TestReadSome"); + BOOST_TEST_MESSAGE( "TestReadSome"); { -@@ -533,3 +533,3 @@ void TestSeek() + std::string junk = makeString(kDefaultBlockSize/2); + +@@ -531,7 +531,7 @@ + + void TestSeek() { - BOOST_MESSAGE( "TestSeek"); + BOOST_TEST_MESSAGE( "TestSeek"); { -@@ -594,3 +594,3 @@ void TestIterator() + const std::string str = "SampleMessage"; + +@@ -592,7 +592,7 @@ + + void TestIterator() { - BOOST_MESSAGE( "TestIterator"); + BOOST_TEST_MESSAGE( "TestIterator"); { -@@ -676,3 +676,3 @@ void TestAsioBuffer() + OutputBuffer ob(2 * kMaxBlockSize + 10); + BOOST_CHECK_EQUAL(ob.numChunks(), 3); +@@ -674,7 +674,7 @@ + void TestAsioBuffer() + { using boost::asio::ip::tcp; - BOOST_MESSAGE( "TestAsioBuffer"); + BOOST_TEST_MESSAGE( "TestAsioBuffer"); { -@@ -748,3 +748,3 @@ void TestSplit() + boost::barrier b(2); + +@@ -746,7 +746,7 @@ + + void TestSplit() { - BOOST_MESSAGE( "TestSplit"); + BOOST_TEST_MESSAGE( "TestSplit"); { -@@ -775,3 +775,3 @@ void TestSplitOnBorder() + const std::string str = "This message is to be split"; + +@@ -773,7 +773,7 @@ + + void TestSplitOnBorder() { - BOOST_MESSAGE( "TestSplitOnBorder"); + BOOST_TEST_MESSAGE( "TestSplitOnBorder"); { -@@ -814,3 +814,3 @@ void TestSplitTwice() + + const std::string part1 = "This message"; +@@ -812,7 +812,7 @@ + + void TestSplitTwice() { - BOOST_MESSAGE( "TestSplitTwice"); + BOOST_TEST_MESSAGE( "TestSplitTwice"); { -@@ -844,3 +844,3 @@ void TestCopy() + const std::string msg1 = makeString(30); + +@@ -842,7 +842,7 @@ + + void TestCopy() { - BOOST_MESSAGE( "TestCopy"); + BOOST_TEST_MESSAGE( "TestCopy"); -@@ -1000,3 +1000,3 @@ void TestBug() + const std::string msg = makeString(30); + // Test1, small data, small buffer +@@ -998,7 +998,7 @@ + // this is reproducing a sequence of steps that caused a crash + void TestBug() { - BOOST_MESSAGE( "TestBug"); + BOOST_TEST_MESSAGE( "TestBug"); { -@@ -1040,3 +1040,3 @@ void TestForeign () + OutputBuffer rxBuf; + OutputBuffer buf; +@@ -1038,7 +1038,7 @@ + + void TestForeign () { - BOOST_MESSAGE( "TestForeign"); + BOOST_TEST_MESSAGE( "TestForeign"); { -@@ -1067,3 +1067,3 @@ void TestForeignDiscard () + std::string hello = "hello "; + std::string there = "there "; +@@ -1065,7 +1065,7 @@ + + void TestForeignDiscard () { - BOOST_MESSAGE( "TestForeign"); + BOOST_TEST_MESSAGE( "TestForeign"); { -@@ -1106,3 +1106,3 @@ void TestPrinter() + std::string hello = "hello "; + std::string again = "again "; +@@ -1104,7 +1104,7 @@ + + void TestPrinter() { - BOOST_MESSAGE( "TestPrinter"); + BOOST_TEST_MESSAGE( "TestPrinter"); { -diff -uNr -p1 src/avro-cpp-1.7.7/test/SchemaTests.cc src-bak/avro-cpp-1.7.7/test/SchemaTests.cc ---- src/avro-cpp-1.7.7/test/SchemaTests.cc 2014-07-18 20:20:04.000000000 +0100 -+++ src-bak/avro-cpp-1.7.7/test/SchemaTests.cc 2015-12-28 16:10:38.783416399 +0000 -@@ -140,3 +140,3 @@ static void testBasic(const char* schema + OutputBuffer ob; + addDataToBuffer(ob, 128); +diff -uNr avro-cpp-1.8.0.orig/test/SchemaTests.cc avro-cpp-1.8.0/test/SchemaTests.cc +--- avro-cpp-1.8.0.orig/test/SchemaTests.cc 2016-02-04 13:28:36.564240294 +0000 ++++ avro-cpp-1.8.0/test/SchemaTests.cc 2016-02-04 13:29:06.177573701 +0000 +@@ -138,19 +138,19 @@ + + static void testBasic(const char* schema) { - BOOST_CHECKPOINT(schema); + BOOST_TEST_CHECKPOINT(schema); compileJsonSchemaFromString(schema); -@@ -146,3 +146,3 @@ static void testBasic_fail(const char* s + } + + static void testBasic_fail(const char* schema) { - BOOST_CHECKPOINT(schema); + BOOST_TEST_CHECKPOINT(schema); BOOST_CHECK_THROW(compileJsonSchemaFromString(schema), Exception); -@@ -152,3 +152,3 @@ static void testCompile(const char* sche + } + + static void testCompile(const char* schema) { - BOOST_CHECKPOINT(schema); + BOOST_TEST_CHECKPOINT(schema); compileJsonSchemaFromString(std::string(schema)); + } + |