Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C7871200BAD for ; Tue, 25 Oct 2016 21:31:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C6185160AF3; Tue, 25 Oct 2016 19:31:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 18C1D160AD8 for ; Tue, 25 Oct 2016 21:31:10 +0200 (CEST) Received: (qmail 25476 invoked by uid 500); 25 Oct 2016 19:31:10 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 25466 invoked by uid 99); 25 Oct 2016 19:31:10 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2016 19:31:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B20F4C09E8 for ; Tue, 25 Oct 2016 19:31:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id kNWbjJY_Uc_J for ; Tue, 25 Oct 2016 19:31:09 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id DC4235FC5F for ; Tue, 25 Oct 2016 19:31:08 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 04928E017A for ; Tue, 25 Oct 2016 19:30:07 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 9D4E93A0DDA for ; Tue, 25 Oct 2016 19:30:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1766585 - /subversion/trunk/subversion/tests/libsvn_subr/xml-test.c Date: Tue, 25 Oct 2016 19:30:07 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161025193007.9D4E93A0DDA@svn01-us-west.apache.org> archived-at: Tue, 25 Oct 2016 19:31:12 -0000 Author: stsp Date: Tue Oct 25 19:30:06 2016 New Revision: 1766585 URL: http://svn.apache.org/viewvc?rev=1766585&view=rev Log: Fix a spurious test failure on OpenBSD due to a bug in the test: subversion/tests/libsvn_subr/xml-test.c:184: (apr_err=SVN_ERR_TEST_FAILED) svn_tests: E200006: Got unxpected error '(null)' FAIL: xml-test 4: test svn_xml_signal_bailout() for invalid XML * subversion/tests/libsvn_subr/xml-test.c (test_invalid_xml_signal_bailout): SVN_TEST_ASSERT_ANY_ERROR() will clear the error so make a copy of its status value and use it instead of err->apr_err. Found by: bb-openbsd buildbot Modified: subversion/trunk/subversion/tests/libsvn_subr/xml-test.c Modified: subversion/trunk/subversion/tests/libsvn_subr/xml-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/xml-test.c?rev=1766585&r1=1766584&r2=1766585&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/xml-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/xml-test.c Tue Oct 25 19:30:06 2016 @@ -168,6 +168,7 @@ test_invalid_xml_signal_bailout(apr_pool const char *xml = ""; xml_callbacks_baton_t b; svn_error_t *err; + apr_status_t status; b.buf = svn_stringbuf_create_empty(pool); b.parser = svn_xml_make_parser(&b, NULL, err_end_elem, NULL, pool); @@ -176,14 +177,14 @@ test_invalid_xml_signal_bailout(apr_pool /* We may get SVN_ERR_XML_MALFORMED or error from err_end_elem() callback. * This behavior depends how XML parser works: it may pre-parse data before * callback invocation. */ - SVN_TEST_ASSERT_ANY_ERROR(err); + status = err->apr_err; + SVN_TEST_ASSERT_ANY_ERROR(err); /* This clears err! */ - if (err->apr_err != SVN_ERR_XML_MALFORMED && - err->apr_err != APR_EGENERAL) + if (status != SVN_ERR_XML_MALFORMED && status != APR_EGENERAL) { return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Got unxpected error '%s'", - svn_error_symbolic_name(err->apr_err)); + svn_error_symbolic_name(status)); } return SVN_NO_ERROR;