You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2015/04/12 11:41:36 UTC
[1/2] thrift git commit: THRIFT-2946 Enhance usability of cross test
framework
Repository: thrift
Updated Branches:
refs/heads/master bb23eadca -> 147a5a278
THRIFT-2946 Enhance usability of cross test framework
*make fail* runs test.py 4 times to detect nondeterministic failures.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/147a5a27
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/147a5a27
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/147a5a27
Branch: refs/heads/master
Commit: 147a5a278a71e4652edb8f60043a057f26d60d1d
Parents: 6d71dc8
Author: Nobuaki Sukegawa <ns...@gmail.com>
Authored: Sat Apr 11 23:01:40 2015 +0900
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Apr 12 09:58:22 2015 +0200
----------------------------------------------------------------------
Makefile.am | 4 +++-
test/known_failures_Linux.json | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/147a5a27/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 5b60c5f..9ba6e8e 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,9 +46,11 @@ precross: all precross-test precross-lib
cross: precross
$(PYTHON) test/test.py -s
+TIMES = 1 2 3
fail: precross
- $(PYTHON) test/test.py
+ $(PYTHON) test/test.py || true
$(PYTHON) test/test.py --update-expected-failures=overwrite
+ $(foreach var,$(TIMES),test/test.py -s || true;test/test.py --update-expected-failures=merge;)
codespell_skip_files = \
*.jar \
http://git-wip-us.apache.org/repos/asf/thrift/blob/147a5a27/test/known_failures_Linux.json
----------------------------------------------------------------------
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index 6ed201b..04419c2 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -17,6 +17,7 @@
"c_glib-rb_binary_framed-ip",
"cpp-cpp_binary_http-domain",
"cpp-cpp_binary_http-ip",
+ "cpp-cpp_compact_http-domain",
"cpp-cpp_compact_http-ip",
"cpp-cpp_json_http-domain",
"cpp-cpp_json_http-ip",
@@ -65,6 +66,7 @@
"cpp-java_compact_http-ip-ssl",
"cpp-java_json_http-ip",
"cpp-java_json_http-ip-ssl",
+ "cpp-nodejs_json_buffered-ip-ssl",
"cpp-php_binary_framed-ip",
"cpp-rb_binary-accel_buffered-ip",
"cpp-rb_binary-accel_framed-ip",
@@ -426,6 +428,7 @@
"nodejs-hs_json_framed-ip",
"nodejs-hs_json_framed-ip-ssl",
"nodejs-java_json_buffered-ip-ssl",
+ "nodejs-nodejs_json_buffered-ip-ssl",
"nodejs-php_binary_framed-ip",
"nodejs-py_json_buffered-ip",
"nodejs-py_json_buffered-ip-ssl",
[2/2] thrift git commit: THRIFT-3091 c_glib service method should
return result from handler method
Posted by ro...@apache.org.
THRIFT-3091 c_glib service method should return result from handler method
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/6d71dc86
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/6d71dc86
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/6d71dc86
Branch: refs/heads/master
Commit: 6d71dc868873691a62b3cb28bf48dcb0e225fa95
Parents: bb23ead
Author: Nobuaki Sukegawa <ns...@gmail.com>
Authored: Sun Apr 12 01:30:58 2015 +0900
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Apr 12 09:58:22 2015 +0200
----------------------------------------------------------------------
compiler/cpp/src/generate/t_c_glib_generator.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/6d71dc86/compiler/cpp/src/generate/t_c_glib_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_c_glib_generator.cc b/compiler/cpp/src/generate/t_c_glib_generator.cc
index c658b4c..098f63b 100644
--- a/compiler/cpp/src/generate/t_c_glib_generator.cc
+++ b/compiler/cpp/src/generate/t_c_glib_generator.cc
@@ -1805,7 +1805,7 @@ void t_c_glib_generator::generate_service_handler(t_service* tservice) {
indent(f_service_) << function_signature(&implementing_function) << endl;
scope_up(f_service_);
f_service_ << indent() << "g_return_val_if_fail (" << this->nspace_uc << "IS_" << service_name_uc
- << "_HANDLER (iface), 0);" << endl << endl << indent() << class_name_uc
+ << "_HANDLER (iface), FALSE);" << endl << endl << indent() << "return " << class_name_uc
<< "_GET_CLASS (iface)"
<< "->" << method_name << " (iface, ";