Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[thrift]: fix thrift 0.9.3 test failure #135

Merged
merged 1 commit into from
Dec 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/thrift/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
27 changes: 27 additions & 0 deletions src/thrift/patch/THRIFT-3577-assertion-failed.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 9f96e358fb5bdac8a6570dc3c79e9416e4f407ce Mon Sep 17 00:00:00 2001
From: Nobuaki Sukegawa <nsuke@apache.org>
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);