You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/03/10 03:36:42 UTC
[1/2] thrift git commit: THRIFT-3731 Perl multiplex test is flaky
Repository: thrift
Updated Branches:
refs/heads/master c87440832 -> 4938bab18
THRIFT-3731 Perl multiplex test is flaky
This closes #941
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/33331a32
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/33331a32
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/33331a32
Branch: refs/heads/master
Commit: 33331a32790726d78b50fa09d2b2f7238fc46f01
Parents: c874408
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Thu Mar 10 09:26:53 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Thu Mar 10 11:34:49 2016 +0900
----------------------------------------------------------------------
lib/perl/Makefile.am | 55 +++++++++++++++++++++++++++++++++++-------
lib/perl/test/Makefile.am | 22 -----------------
2 files changed, 46 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/33331a32/lib/perl/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index 6b0f9dd..2fb8c5a 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -23,23 +23,18 @@ Makefile-perl.mk : Makefile.PL
$(PERL) Makefile.PL MAKEFILE=Makefile-perl.mk INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(PERL_PREFIX)
all-local: Makefile-perl.mk
- $(MAKE) -f Makefile-perl.mk
+ $(MAKE) -f $<
find blib -name 'Makefile*' -exec rm -f {} \;
-check-local:
- $(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/test/gen-perl \
- -I@builddir@/test/gen-perl/BenchmarkTest \
- -I@builddir@/test/gen-perl/Aggr \
- @abs_srcdir@/test.pl @abs_srcdir@/test/*.t
-
install-exec-local: Makefile-perl.mk
- $(MAKE) -f Makefile-perl.mk install DESTDIR=$(DESTDIR)/
+ $(MAKE) -f $< install DESTDIR=$(DESTDIR)/
clean-local:
if test -f Makefile-perl.mk ; then \
$(MAKE) -f Makefile-perl.mk clean ; \
fi
- rm -f Makefile-perl.mk.old
+ $(RM) Makefile-perl.mk.old
+ $(RM) -r gen-perl gen-perl2
EXTRA_DIST = \
coding_standards.md \
@@ -64,3 +59,45 @@ EXTRA_DIST = \
lib/Thrift/SSLServerSocket.pm \
lib/Thrift/Transport.pm \
README.md
+
+THRIFT = @top_builddir@/compiler/cpp/thrift
+THRIFT_IF = @top_srcdir@/test/ThriftTest.thrift
+NAME_BENCHMARKSERVICE = @top_srcdir@/lib/rb/benchmark/Benchmark.thrift
+NAME_AGGR = @top_srcdir@/contrib/async-test/aggr.thrift
+
+THRIFTTEST_GEN = \
+ gen-perl/ThriftTest/Constants.pm \
+ gen-perl/ThriftTest/SecondService.pm \
+ gen-perl/ThriftTest/ThriftTest.pm \
+ gen-perl/ThriftTest/Types.pm
+
+BENCHMARK_GEN = \
+ gen-perl/BenchmarkService.pm \
+ gen-perl/Constants.pm \
+ gen-perl/Types.pm
+
+AGGR_GEN = \
+ gen-perl2/Aggr.pm \
+ gen-perl2/Constants.pm \
+ gen-perl2/Types.pm
+
+PERL_GEN = \
+ $(THRIFTTEST_GEN) \
+ $(BENCHMARK_GEN) \
+ $(AGGR_GEN)
+
+BUILT_SOURCES = $(PERL_GEN)
+
+check-local: $(PERL_GEN)
+ $(PERL) -Iblib/lib -I@abs_srcdir@ -I@builddir@/gen-perl2 -I@builddir@/gen-perl \
+ @abs_srcdir@/test.pl @abs_srcdir@/test/*.t
+
+$(THRIFTTEST_GEN): $(THRIFT_IF) $(THRIFT)
+ $(THRIFT) --gen perl $<
+
+$(BENCHMARK_GEN): $(NAME_BENCHMARKSERVICE) $(THRIFT)
+ $(THRIFT) --gen perl $<
+
+$(AGGR_GEN): $(NAME_AGGR) $(THRIFT)
+ $(MKDIR_P) gen-perl2
+ $(THRIFT) -out gen-perl2 --gen perl $<
http://git-wip-us.apache.org/repos/asf/thrift/blob/33331a32/lib/perl/test/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/perl/test/Makefile.am b/lib/perl/test/Makefile.am
index 2c9ce2a..de03971 100644
--- a/lib/perl/test/Makefile.am
+++ b/lib/perl/test/Makefile.am
@@ -17,26 +17,4 @@
# under the License.
#
-THRIFT = @top_builddir@/compiler/cpp/thrift
-THRIFT_IF = @top_srcdir@/test/ThriftTest.thrift
-NAME_BENCHMARKSERVICE = @top_srcdir@/lib/rb/benchmark/Benchmark.thrift
-NAME_AGGR = @top_srcdir@/contrib/async-test/aggr.thrift
-
-check-local: \
- gen-perl/ThriftTest/Types.pm \
- gen-perl/BenchmarkTest/BenchmarkService.pm \
- gen-perl/Aggr/Aggr.pm
-
-gen-perl/ThriftTest/Types.pm: $(THRIFT_IF)
- $(THRIFT) --gen perl $(THRIFT_IF)
-
-clean-local:
- rm -rf gen-perl
-
-gen-perl/BenchmarkTest/BenchmarkService.pm: $(NAME_BENCHMARKSERVICE)
- $(THRIFT) --gen perl $(NAME_BENCHMARKSERVICE)
-
-gen-perl/Aggr/Aggr.pm: $(NAME_AGGR)
- $(THRIFT) --gen perl $(NAME_AGGR)
-
EXTRA_DIST = memory_buffer.t processor.t multiplex.t
[2/2] thrift git commit: THRIFT-3725 Skip a flaky cross test entry
(d-dart compact framed-ip)
Posted by ns...@apache.org.
THRIFT-3725 Skip a flaky cross test entry (d-dart compact framed-ip)
This closes #935
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4938bab1
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4938bab1
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4938bab1
Branch: refs/heads/master
Commit: 4938bab1846f87c60719def89551f0f0abb12bb4
Parents: 33331a3
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Wed Mar 9 20:00:00 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Thu Mar 10 11:35:55 2016 +0900
----------------------------------------------------------------------
test/known_failures_Linux.json | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/4938bab1/test/known_failures_Linux.json
----------------------------------------------------------------------
diff --git a/test/known_failures_Linux.json b/test/known_failures_Linux.json
index bdc4084..6712081 100644
--- a/test/known_failures_Linux.json
+++ b/test/known_failures_Linux.json
@@ -115,6 +115,7 @@
"d-d_json_http-ip-ssl",
"d-dart_binary_framed-ip",
"d-dart_binary_http-ip",
+ "d-dart_compact_framed-ip",
"d-dart_compact_http-ip",
"d-dart_json_framed-ip",
"d-dart_json_http-ip",