This merge broke the C++ M2 build
SimpleTestCaseBase.h:33:23: error: TestUtils.h: No such file or directory
interop_runner.cpp:36:32: error: P2PMessageSizeTest.h: No such file or
directory
interop_runner.cpp:37:35: error: PubSubMessageSizeTest.h: No such file
or directory
interop_runner.cpp:117: error: expected type-specifier
interop_runner.cpp:117: error: expected `)'
interop_runner.cpp:117: error: no matching function for call to
‘Listener::registerTest(const char [19], int*)’
interop_runner.cpp:118: error: expected type-specifier
interop_runner.cpp:118: error: expected `)'
interop_runner.cpp:118: error: no matching function for call to
‘Listener::registerTest(const char [22], int*)’
error: Bad exit status from /var/tmp/rpm-tmp.12059 (%check)
make[4]: *** [interop_runner.o] Error 1
make[3]: *** [check-am] Error 2
make[2]: *** [check-recursive] Error 1
make[1]: *** [rpm] Error 1
make: *** [rpm] Error 2
Added:
incubator/qpid/branches/M2/cpp/tests/P2PMessageSizeTest.cpp
- copied unchanged from r580265,
incubator/qpid/branches/M2.1/cpp/tests/P2PMessageSizeTest.cpp
incubator/qpid/branches/M2/cpp/tests/P2PMessageSizeTest.h
- copied unchanged from r580265,
incubator/qpid/branches/M2.1/cpp/tests/P2PMessageSizeTest.h
incubator/qpid/branches/M2/cpp/tests/PubSubMessageSizeTest.cpp
- copied unchanged from r580265,
incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.cpp
incubator/qpid/branches/M2/cpp/tests/PubSubMessageSizeTest.h
- copied unchanged from r580265,
incubator/qpid/branches/M2.1/cpp/tests/PubSubMessageSizeTest.h
incubator/qpid/branches/M2/cpp/tests/TestUtils.cpp
- copied unchanged from r580265,
incubator/qpid/branches/M2.1/cpp/tests/TestUtils.cpp
incubator/qpid/branches/M2/cpp/tests/TestUtils.h
- copied unchanged from r580265,
incubator/qpid/branches/M2.1/cpp/tests/TestUtils.h