From 775156f3bfbb259d2585b0e7020bb815cad57fbf Mon Sep 17 00:00:00 2001 From: lguohan Date: Fri, 16 Dec 2016 19:12:56 -0800 Subject: [PATCH] [thrift]: fix thrift 0.9.3 test failure (#135) https://issues.apache.org/jira/browse/THRIFT-3577 --- src/thrift/Makefile | 1 + .../patch/THRIFT-3577-assertion-failed.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/thrift/patch/THRIFT-3577-assertion-failed.patch diff --git a/src/thrift/Makefile b/src/thrift/Makefile index edb14e0cfa..2b450e52d4 100644 --- a/src/thrift/Makefile +++ b/src/thrift/Makefile @@ -19,6 +19,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc pushd thrift-$(THRIFT_VERSION) + patch -p1 < ../patch/THRIFT-3577-assertion-failed.patch dpkg-buildpackage -d -rfakeroot -b -us -uc popd diff --git a/src/thrift/patch/THRIFT-3577-assertion-failed.patch b/src/thrift/patch/THRIFT-3577-assertion-failed.patch new file mode 100644 index 0000000000..ad984ebbdb --- /dev/null +++ b/src/thrift/patch/THRIFT-3577-assertion-failed.patch @@ -0,0 +1,27 @@ +From 9f96e358fb5bdac8a6570dc3c79e9416e4f407ce Mon Sep 17 00:00:00 2001 +From: Nobuaki Sukegawa +Date: Mon, 22 Feb 2016 01:33:27 +0900 +Subject: [PATCH] THRIFT-3577 assertion failed at line 512 of + testcontainertest.c + +--- + lib/c_glib/test/testcontainertest.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/c_glib/test/testcontainertest.c b/lib/c_glib/test/testcontainertest.c +index 852254b..1cbc55c 100644 +--- a/lib/c_glib/test/testcontainertest.c ++++ b/lib/c_glib/test/testcontainertest.c +@@ -507,9 +507,9 @@ main(int argc, char *argv[]) + + /* Make sure the server stopped only because it was interrupted (by the + child process terminating) */ +- g_assert (g_error_matches (error, +- THRIFT_SERVER_SOCKET_ERROR, +- THRIFT_SERVER_SOCKET_ERROR_ACCEPT)); ++ g_assert(!error || g_error_matches(error, ++ THRIFT_SERVER_SOCKET_ERROR, ++ THRIFT_SERVER_SOCKET_ERROR_ACCEPT)); + + /* Free our resources */ + g_object_unref (server);