apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r783967 - in /apr/apr-util/branches/1.4.x: ./ buckets/apr_brigade.c test/testxml.c
Date Fri, 12 Jun 2009 02:46:52 GMT
Author: bojan
Date: Fri Jun 12 02:46:52 2009
New Revision: 783967

URL: http://svn.apache.org/viewvc?rev=783967&view=rev
Log:
Backport r781409 from the trunk.
* test/testxml.c (test_billion_laughs): Use correct macro and fix data file 
  location.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.4.x/test/testxml.c

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 12 02:46:52 2009
@@ -1,2 +1,2 @@
-/apr/apr/trunk:781403
+/apr/apr/trunk:781403,781409
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.4.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 12 02:46:52 2009
@@ -1,2 +1,2 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409
 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.4.x/test/testxml.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/testxml.c?rev=783967&r1=783966&r2=783967&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/testxml.c (original)
+++ apr/apr-util/branches/1.4.x/test/testxml.c Fri Jun 12 02:46:52 2009
@@ -155,9 +155,9 @@
     apr_xml_doc *doc;
     apr_status_t rv;
 
-    rv = apr_file_open(&fd, "billion-laughs.xml", 
+    rv = apr_file_open(&fd, "data/billion-laughs.xml", 
                        APR_FOPEN_READ, 0, p);
-    apr_assert_success(tc, "open billion-laughs.xml", rv);
+    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);



Mime
View raw message