tests/data: use more `%TESTNUMBER` macro for previous patch

Follow-up to d75716e4e55c7074566f48d8c03bfd721461e105 #19799
Cherry-picked from #19882
Closes #19885

diff --git a/tests/data/test1400 b/tests/data/test1400
index 5b7758fae8f29e516be808e483d8707beb1ef1c0..289f35720891f2f2ee532afc9ecd541331cf5852 100644 (file)
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -60,7 +60,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1400.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1401 b/tests/data/test1401
index 87ed2e4543f61582ff666fb3764241dd6a6c6c42..c66517c414c70aed75189503fbd601a062bcf3d0 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -70,7 +70,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1401.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1402 b/tests/data/test1402
index 86eb102045e5719452b7b5692ec8b47f221d6e1a..401daa3ba5b732741a2848f90cd30f0a16e30b87 100644 (file)
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -63,7 +63,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1402.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1403 b/tests/data/test1403
index 6627b70aa1f3c56ee693484fd4b3fc51cb0e83ac..2a9cba0bed159e95c15234351f24648c2afd4c9c 100644 (file)
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -60,7 +60,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1403.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1404 b/tests/data/test1404
index 4471101246c03c79525ad3aaed32e52a04e21c12..173214c8c120ead8800ee9ccfed6b25e77c6be3f 100644 (file)
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -106,7 +106,7 @@ $_ = '' if /CURLOPT_TIMEOUT_MS/
 $_ = '' if /\/\* "value" \*\//
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1404.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1405 b/tests/data/test1405
index 880f345e7270ab2c0c07027524165a381664124e..5464d6ad316eb9a60d318d0ddf4ed8062ace5574 100644 (file)
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -78,7 +78,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1405.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1406 b/tests/data/test1406
index 0dfa41839b17aecfab51fc658cbdbafd40f96ba1..83319c07d9e7785fb9ea3114ad3f74ba3ab7f423 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -75,7 +75,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1406.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1407 b/tests/data/test1407
index 300b5efdaea3f5ddc0eca16156beacd7d80aa111..b2da0479ae42b29227b06712001934e4892d86d5 100644 (file)
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -64,7 +64,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1407.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1420 b/tests/data/test1420
index 530cf985bd2c361e6f29e5b4cf7c09d8eb863855..6194d81e811927553913fc66533b5dc42fa09ad2 100644 (file)
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -67,7 +67,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1420.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1465 b/tests/data/test1465
index 0026ae383122cb832c4e7dbb57a0ac73c1a2ad96..58f202499f4ead319a2d148f57d8975b9f01b731 100644 (file)
--- a/tests/data/test1465
+++ b/tests/data/test1465
@@ -66,7 +66,7 @@ $_ = '' if /CURLOPT_SSLVERSION/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1465.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test1481 b/tests/data/test1481
index a3e2595450477b700a3022d58eb76ece0044b794..490206895595427c50ccf12db2c2a6d75fbd1b27 100644 (file)
--- a/tests/data/test1481
+++ b/tests/data/test1481
@@ -62,7 +62,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/
 $_ = '' if /CURLOPT_TIMEOUT_MS/
 </stripfile>
 <file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
-%includetext %SRCDIR/data/data1481.c%
+%includetext %SRCDIR/data/data%TESTNUMBER.c%
 </file>
 </verify>
 </testcase>