← Commit list

ca27404d27

Viktor Szakats
Viktor Szakats
2025-11-13
SUCCESS Duration: 304s

Subject

tests/data: add `%includetext`, dedupe XML payloads into external file

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

REUSE.toml +1 -0docs/tests/FILEFORMAT.md +5 -0tests/data/Makefile.am +1 -1tests/data/data-xml1 +112 -0tests/data/test1123 +1 -112tests/data/test1277 +1 -112tests/data/test222 +1 -112tests/data/test230 +1 -112tests/data/test232 +1 -112tests/data/test314 +1 -112tests/data/test396 +1 -112tests/testutil.pm +8 -2
REUSE.toml+1 -0
@@ -35,6 +35,7 @@ path = [
"RELEASE-NOTES",
"renovate.json",
"tests/certs/**",
+ "tests/data/data**",
"tests/data/test**",
"tests/valgrind.supp",
]
docs/tests/FILEFORMAT.md+5 -0
@@ -106,6 +106,11 @@ the include instruction:
%include filename%
+Or, a variant of the above where the file is loaded as a newline-agnostic
+text file, and `%CR`, `%SP`, `%TAB` macros are expanded after inclusion:
+
+ %includetext filename%
+
## Conditional lines
Lines in the test file can be made to appear conditionally on a specific
tests/data/Makefile.am+1 -1
@@ -283,4 +283,4 @@ test3200 test3201 test3202 test3203 test3204 test3205 test3206 test3207 test3208
test3209 test3210 test3211 test3212 test3213 test3214 test3215 \
test4000 test4001
-EXTRA_DIST = $(TESTCASES) DISABLED
+EXTRA_DIST = $(TESTCASES) DISABLED data-xml1
tests/data/data-xml1+112 -0
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
+<project-listing>
+ <project>
+ <project_id>1612</project_id>
+ <date_added>1998-08-21 04:01:29</date_added>
+ <date_updated>2004-10-18 02:22:23</date_updated>
+ <projectname_short>curl</projectname_short>
+ <projectname_full>curl and libcurl</projectname_full>
+ <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
+ <desc_full>curl and libcurl is a tool for transferring files%CR
+using URL syntax. It supports HTTP, HTTPS, FTP,%CR
+FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
+well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
+resumed transfers, passwords, portnumbers, SSL%CR
+certificates, Kerberos, and proxies. It is powered%CR
+by libcurl, the client-side URL transfer library.%CR
+There are bindings to libcurl for over 20%CR
+languages and environments.%CR
+</desc_full>
+ <vitality_score>5784.57</vitality_score>
+ <vitality_percent>3.16</vitality_percent>
+ <vitality_rank>169</vitality_rank>
+ <popularity_score>6594.54</popularity_score>
+ <popularity_percent>13.81</popularity_percent>
+ <popularity_rank>105</popularity_rank>
+ <rating>8.50</rating>
+ <rating_count>21</rating_count>
+ <rating_rank>183</rating_rank>
+ <subscriptions>323</subscriptions>
+ <branch_name>Default</branch_name>
+ <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
+ <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
+ <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
+ <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
+ <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
+ <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
+ <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
+ <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
+ <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
+ <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
+ <url_purchase></url_purchase>
+ <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
+ <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
+ <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
+ <url_demo></url_demo>
+ <license>MIT/X Consortium License</license>
+ <latest_release>
+ <latest_release_version>7.12.2</latest_release_version>
+ <latest_release_id>176085</latest_release_id>
+ <latest_release_date>2004-10-18 02:22:23</latest_release_date>
+ </latest_release>
+ <screenshot_thumb></screenshot_thumb>
+ <authors>
+ <author>
+ <author_name>Daniel Stenberg</author_name>
+ <author_url>http://freshmeat.net/~bagder/</author_url>
+ <author_role>Owner</author_role>
+ </author>
+ </authors>
+ <descriminators>
+ <trove_id>12</trove_id>
+ <trove_id>226</trove_id>
+ <trove_id>3</trove_id>
+ <trove_id>2</trove_id>
+ <trove_id>188</trove_id>
+ <trove_id>216</trove_id>
+ <trove_id>200</trove_id>
+ <trove_id>220</trove_id>
+ <trove_id>164</trove_id>
+ <trove_id>90</trove_id>
+ <trove_id>89</trove_id>
+ <trove_id>809</trove_id>
+ <trove_id>150</trove_id>
+ <trove_id>224</trove_id>
+ <trove_id>900</trove_id>
+ <trove_id>839</trove_id>
+ </descriminators>
+ <dependencies>
+ <dependency type="recommended">
+ <dependency_release_id>0</dependency_release_id>
+ <dependency_branch_id>7464</dependency_branch_id>
+ <dependency_project_id>7464</dependency_project_id>
+ <dependency_project_title>OpenSSL (Default)</dependency_project_title>
+ </dependency>
+ <dependency type="optional">
+ <dependency_release_id>0</dependency_release_id>
+ <dependency_branch_id>0</dependency_branch_id>
+ <dependency_project_id>7443</dependency_project_id>
+ <dependency_project_title>OpenLDAP</dependency_project_title>
+ </dependency>
+ <dependency type="optional">
+ <dependency_release_id>0</dependency_release_id>
+ <dependency_branch_id>0</dependency_branch_id>
+ <dependency_project_id>12351</dependency_project_id>
+ <dependency_project_title>zlib</dependency_project_title>
+ </dependency>
+ <dependency type="optional">
+ <dependency_release_id>0</dependency_release_id>
+ <dependency_branch_id>0</dependency_branch_id>
+ <dependency_project_id>32047</dependency_project_id>
+ <dependency_project_title>Heimdal</dependency_project_title>
+ </dependency>
+ <dependency type="optional">
+ <dependency_release_id>0</dependency_release_id>
+ <dependency_branch_id>0</dependency_branch_id>
+ <dependency_project_id>44532</dependency_project_id>
+ <dependency_project_title>c-ares</dependency_project_title>
+ </dependency>
+ </dependencies>
+ </project>
+</project-listing>
tests/data/test1123+1 -112
@@ -35,118 +35,7 @@ Vary: Accept-Encoding%CR
Content-Type: text/html; charset=ISO-8859-1%CR
Transfer-Encoding: deflate, chunked%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/data/test1277+1 -112
@@ -39,118 +39,7 @@ Content-Type: text/html; charset=ISO-8859-1%CR
Transfer-Encoding: gzip, chunked%CR
Content-Encoding: deflate%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/data/test222+1 -112
@@ -33,118 +33,7 @@ Content-Type: text/html; charset=ISO-8859-1%CR
Content-Encoding: deflate%CR
Content-Length: 1305%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/data/test230+1 -112
@@ -33,118 +33,7 @@ Content-Type: text/html; charset=ISO-8859-1%CR
Content-Encoding: deflate, identity, gzip%CR
Content-Length: 1328%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/data/test232+1 -112
@@ -33,118 +33,7 @@ Content-Type: text/html; charset=ISO-8859-1%CR
Content-Encoding: deflate%CR
Content-Length: 1287%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/data/test314+1 -112
@@ -35,118 +35,7 @@ Content-Type: text/html; charset=ISO-8859-1%CR
Content-Encoding: br%CR
Content-Length: 1056%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/data/test396+1 -112
@@ -32,118 +32,7 @@ Content-Type: text/html; charset=ISO-8859-1%CR
Content-Encoding: zstd%CR
Content-Length: 1309%CR
%CR
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project-listing SYSTEM "http://freshmeat.net/backend/fm-projects-0.4.dtd">
-<project-listing>
- <project>
- <project_id>1612</project_id>
- <date_added>1998-08-21 04:01:29</date_added>
- <date_updated>2004-10-18 02:22:23</date_updated>
- <projectname_short>curl</projectname_short>
- <projectname_full>curl and libcurl</projectname_full>
- <desc_short>Command line tool and library for client-side URL transfers.</desc_short>
- <desc_full>curl and libcurl is a tool for transferring files%CR
-using URL syntax. It supports HTTP, HTTPS, FTP,%CR
-FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as%CR
-well as HTTP-post, HTTP-put, cookies, FTP upload,%CR
-resumed transfers, passwords, portnumbers, SSL%CR
-certificates, Kerberos, and proxies. It is powered%CR
-by libcurl, the client-side URL transfer library.%CR
-There are bindings to libcurl for over 20%CR
-languages and environments.%CR
-</desc_full>
- <vitality_score>5784.57</vitality_score>
- <vitality_percent>3.16</vitality_percent>
- <vitality_rank>169</vitality_rank>
- <popularity_score>6594.54</popularity_score>
- <popularity_percent>13.81</popularity_percent>
- <popularity_rank>105</popularity_rank>
- <rating>8.50</rating>
- <rating_count>21</rating_count>
- <rating_rank>183</rating_rank>
- <subscriptions>323</subscriptions>
- <branch_name>Default</branch_name>
- <url_project_page>http://freshmeat.net/projects/curl/</url_project_page>
- <url_homepage>http://freshmeat.net/redir/curl/1612/url_homepage/</url_homepage>
- <url_tgz>http://freshmeat.net/redir/curl/1612/url_tgz/</url_tgz>
- <url_bz2>http://freshmeat.net/redir/curl/1612/url_bz2/</url_bz2>
- <url_zip>http://freshmeat.net/redir/curl/1612/url_zip/</url_zip>
- <url_changelog>http://freshmeat.net/redir/curl/1612/url_changelog/</url_changelog>
- <url_rpm>http://freshmeat.net/redir/curl/1612/url_rpm/</url_rpm>
- <url_deb>http://freshmeat.net/redir/curl/1612/url_deb/</url_deb>
- <url_osx>http://freshmeat.net/redir/curl/1612/url_osx/</url_osx>
- <url_bsdport>http://freshmeat.net/redir/curl/1612/url_bsdport/</url_bsdport>
- <url_purchase></url_purchase>
- <url_cvs>http://freshmeat.net/redir/curl/1612/url_cvs/</url_cvs>
- <url_list>http://freshmeat.net/redir/curl/1612/url_list/</url_list>
- <url_mirror>http://freshmeat.net/redir/curl/1612/url_mirror/</url_mirror>
- <url_demo></url_demo>
- <license>MIT/X Consortium License</license>
- <latest_release>
- <latest_release_version>7.12.2</latest_release_version>
- <latest_release_id>176085</latest_release_id>
- <latest_release_date>2004-10-18 02:22:23</latest_release_date>
- </latest_release>
- <screenshot_thumb></screenshot_thumb>
- <authors>
- <author>
- <author_name>Daniel Stenberg</author_name>
- <author_url>http://freshmeat.net/~bagder/</author_url>
- <author_role>Owner</author_role>
- </author>
- </authors>
- <descriminators>
- <trove_id>12</trove_id>
- <trove_id>226</trove_id>
- <trove_id>3</trove_id>
- <trove_id>2</trove_id>
- <trove_id>188</trove_id>
- <trove_id>216</trove_id>
- <trove_id>200</trove_id>
- <trove_id>220</trove_id>
- <trove_id>164</trove_id>
- <trove_id>90</trove_id>
- <trove_id>89</trove_id>
- <trove_id>809</trove_id>
- <trove_id>150</trove_id>
- <trove_id>224</trove_id>
- <trove_id>900</trove_id>
- <trove_id>839</trove_id>
- </descriminators>
- <dependencies>
- <dependency type="recommended">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>7464</dependency_branch_id>
- <dependency_project_id>7464</dependency_project_id>
- <dependency_project_title>OpenSSL (Default)</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>7443</dependency_project_id>
- <dependency_project_title>OpenLDAP</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>12351</dependency_project_id>
- <dependency_project_title>zlib</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>32047</dependency_project_id>
- <dependency_project_title>Heimdal</dependency_project_title>
- </dependency>
- <dependency type="optional">
- <dependency_release_id>0</dependency_release_id>
- <dependency_branch_id>0</dependency_branch_id>
- <dependency_project_id>44532</dependency_project_id>
- <dependency_project_title>c-ares</dependency_project_title>
- </dependency>
- </dependencies>
- </project>
-</project-listing>
+%includetext %SRCDIR/data/data-xml1%
</datacheck>
</reply>
tests/testutil.pm+8 -2
@@ -100,8 +100,11 @@ sub clearlogs {
#######################################################################
sub includefile {
- my ($f) = @_;
+ my ($f, $text) = @_;
open(F, "<$f");
+ if($text) {
+ binmode F, ':crlf';
+ }
my @a = <F>;
close(F);
return join("", @a);
@@ -147,12 +150,15 @@ sub subbase64 {
$$thing =~ s/%%DAYS%%/%alternatives[$d,$d2]/;
}
+ # include a file, expand space macros
+ $$thing =~ s/%includetext ([^%]*)%[\n\r]+/includefile($1, 1)/ge;
+
$$thing =~ s/%SP/ /g; # space
$$thing =~ s/%TAB/\t/g; # horizontal tab
$$thing =~ s/%CR/\r/g; # carriage return aka \r aka 0x0d
# include a file
- $$thing =~ s/%include ([^%]*)%[\n\r]+/includefile($1)/ge;
+ $$thing =~ s/%include ([^%]*)%[\n\r]+/includefile($1, 0)/ge;
}
my $prevupdate; # module scope so it remembers the last value