matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[thrift]: fix thrift 0.9.3 test failure (#135)

Browse Source 
https://issues.apache.org/jira/browse/THRIFT-3577
This commit is contained in:
lguohan 2016-12-16 19:12:56 -08:00 committed by GitHub
parent da9022971e
commit 775156f3bf
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/thrift/Makefile
View File

@ -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

27
src/thrift/patch/THRIFT-3577-assertion-failed.patch Normal file
View File

@ -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);