From: Viktor Szakats <commit@vsz.me>
Date: Thu, 13 Nov 2025 01:11:48 +0000 (+0100)
Subject: tests/data: add `%includetext`, dedupe XML payloads into external file
X-Git-Tag: rc-8_18_0-1~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca27404d2737e64bdc803fc7456e9a72bf61bb01;p=thirdparty%2Fcurl.git

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

To reduce duplication and to avoid keeping XML-like markup within XML
markup (`test*`), that was tripping `xmllint`.

Ref: #19470

Closes #19504
---

diff --git a/REUSE.toml b/REUSE.toml
index fff5380164..e9e9ecf03d 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -35,6 +35,7 @@ path = [
   "RELEASE-NOTES",
   "renovate.json",
   "tests/certs/**",
+  "tests/data/data**",
   "tests/data/test**",
   "tests/valgrind.supp",
 ]
diff --git a/docs/tests/FILEFORMAT.md b/docs/tests/FILEFORMAT.md
index df5eed8ac6..3897deb9cb 100644
--- a/docs/tests/FILEFORMAT.md
+++ b/docs/tests/FILEFORMAT.md
@@ -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
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index c9e3f75ba1..d417a70a40 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -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
diff --git a/tests/data/data-xml1 b/tests/data/data-xml1
new file mode 100644
index 0000000000..76d8a4afd4
--- /dev/null
+++ b/tests/data/data-xml1
@@ -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>
diff --git a/tests/data/test1123 b/tests/data/test1123
index d0fc9fb066..80ec7b4cb3 100644
--- a/tests/data/test1123
+++ b/tests/data/test1123
@@ -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>
diff --git a/tests/data/test1277 b/tests/data/test1277
index b229a0e1c2..56275d2bc5 100644
--- a/tests/data/test1277
+++ b/tests/data/test1277
@@ -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>
diff --git a/tests/data/test222 b/tests/data/test222
index e1b3bceb3a..0f09d9caaa 100644
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -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>
diff --git a/tests/data/test230 b/tests/data/test230
index 45f0a7f884..9d7703ed19 100644
--- a/tests/data/test230
+++ b/tests/data/test230
@@ -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>
diff --git a/tests/data/test232 b/tests/data/test232
index 94cb1b9f99..9fe30dd005 100644
--- a/tests/data/test232
+++ b/tests/data/test232
@@ -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>
diff --git a/tests/data/test314 b/tests/data/test314
index 4f14957a43..6074da33c3 100644
--- a/tests/data/test314
+++ b/tests/data/test314
@@ -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>
diff --git a/tests/data/test396 b/tests/data/test396
index 5dd3faed13..bc29bad5f7 100644
--- a/tests/data/test396
+++ b/tests/data/test396
@@ -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>
diff --git a/tests/testutil.pm b/tests/testutil.pm
index 126f83e021..35fe4bd633 100644
--- a/tests/testutil.pm
+++ b/tests/testutil.pm
@@ -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