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/02/21 18:48:45 UTC

[1/2] thrift git commit: THRIFT-3577 assertion failed at line 512 of testcontainertest.c Client: Test (c_glib) Patch: Nobuaki Sukegawa

Repository: thrift
Updated Branches:
  refs/heads/master ea2bd9cb0 -> 33de26cf6


THRIFT-3577 assertion failed at line 512 of testcontainertest.c
Client: Test (c_glib)
Patch: Nobuaki Sukegawa

This closes #882


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2303d978
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2303d978
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2303d978

Branch: refs/heads/master
Commit: 2303d978c0f93104ec358d9adecfe524dbcfa994
Parents: ea2bd9c
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Mon Feb 22 01:33:27 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Mon Feb 22 02:47:06 2016 +0900

----------------------------------------------------------------------
 lib/c_glib/test/testcontainertest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/2303d978/lib/c_glib/test/testcontainertest.c
----------------------------------------------------------------------
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);


[2/2] thrift git commit: THRIFT-3635 D transport_test is flaky on Jenkins and Travis Client: Test (D) Patch: Nobuaki Sukegawa

Posted by ns...@apache.org.
THRIFT-3635 D transport_test is flaky on Jenkins and Travis
Client: Test (D)
Patch: Nobuaki Sukegawa

This closes #883


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/33de26cf
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/33de26cf
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/33de26cf

Branch: refs/heads/master
Commit: 33de26cf658450513ef5731ac55b635addb4d43d
Parents: 2303d97
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Mon Feb 22 01:43:23 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Mon Feb 22 02:48:00 2016 +0900

----------------------------------------------------------------------
 build/docker/debian/Dockerfile | 8 +++-----
 build/docker/ubuntu/Dockerfile | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/33de26cf/build/docker/debian/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/debian/Dockerfile b/build/docker/debian/Dockerfile
index b9e1da7..66f48a3 100644
--- a/build/docker/debian/Dockerfile
+++ b/build/docker/debian/Dockerfile
@@ -149,14 +149,12 @@ RUN apt-get update && apt-get install -y \
       mono-xbuild
 
 # D dependencies
-# THRIFT-2916: DMD pinned to 2.065.0-0 due to regression in 2.066
-# THRIFT-3253: DMD pinned to 2.065.0-0 due to deprecations 2.067.1
 RUN apt-get update && apt-get install -y \
       gcc-multilib \
       xdg-utils \
-    && curl -sSL http://downloads.dlang.org/releases/2.x/2.065.0/dmd_2.065.0-0_amd64.deb -o /tmp/dmd_2.065.0-0_amd64.deb && \
-    dpkg -i /tmp/dmd_2.065.0-0_amd64.deb && \
-    rm /tmp/dmd_2.065.0-0_amd64.deb
+    && curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
+    dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \
+    rm /tmp/dmd_2.070.0-0_amd64.deb
 
 # Dart dependencies
 RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \

http://git-wip-us.apache.org/repos/asf/thrift/blob/33de26cf/build/docker/ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index 64baba9..2a37f2f 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -151,14 +151,12 @@ RUN apt-get update && apt-get install -y \
       mono-xbuild
 
 # D dependencies
-# THRIFT-2916: DMD pinned to 2.065.0-0 due to regression in 2.066
-# THRIFT-3253: DMD pinned to 2.065.0-0 due to deprecations 2.067.1
 RUN apt-get update && apt-get install -y \
       gcc-multilib \
       xdg-utils \
-    && curl -sSL http://downloads.dlang.org/releases/2.x/2.065.0/dmd_2.065.0-0_amd64.deb -o /tmp/dmd_2.065.0-0_amd64.deb && \
-    dpkg -i /tmp/dmd_2.065.0-0_amd64.deb && \
-    rm /tmp/dmd_2.065.0-0_amd64.deb
+    && curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd64.deb -o /tmp/dmd_2.070.0-0_amd64.deb && \
+    dpkg -i /tmp/dmd_2.070.0-0_amd64.deb && \
+    rm /tmp/dmd_2.070.0-0_amd64.deb
 
 # Dart dependencies
 RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \