Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 656C270EA for ; Thu, 10 Nov 2011 01:38:48 +0000 (UTC) Received: (qmail 49184 invoked by uid 500); 10 Nov 2011 01:38:48 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 49130 invoked by uid 500); 10 Nov 2011 01:38:47 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 49123 invoked by uid 99); 10 Nov 2011 01:38:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 01:38:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 01:38:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5044523888FD for ; Thu, 10 Nov 2011 01:38:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200085 - /apr/apr-util/branches/1.5.x/test/testxml.c Date: Thu, 10 Nov 2011 01:38:24 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111110013824.5044523888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Nov 10 01:38:23 2011 New Revision: 1200085 URL: http://svn.apache.org/viewvc?rev=1200085&view=rev Log: Don't check return code for billion laugther test. Otherwise test will fail when using builtin expat (it does work for expat 2 but we only want to test against the original billion laugther problem). This is the same we do in 1.3.x. Trunk is different, because we no longer support builtin expat there. Modified: apr/apr-util/branches/1.5.x/test/testxml.c Modified: apr/apr-util/branches/1.5.x/test/testxml.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/testxml.c?rev=1200085&r1=1200084&r2=1200085&view=diff ============================================================================== --- apr/apr-util/branches/1.5.x/test/testxml.c (original) +++ apr/apr-util/branches/1.5.x/test/testxml.c Thu Nov 10 01:38:23 2011 @@ -159,8 +159,9 @@ static void test_billion_laughs(abts_cas APR_FOPEN_READ, 0, p); apr_assert_success(tc, "open billion-laughs.xml", rv); - rv = apr_xml_parse_file(p, &parser, &doc, fd, 2000); - ABTS_TRUE(tc, rv != APR_SUCCESS); + /* Don't test for return value; if it returns, chances are the bug + * is fixed or the machine has insane amounts of RAM. */ + apr_xml_parse_file(p, &parser, &doc, fd, 2000); apr_file_close(fd); }