tests: rename tests scripts to the test number

It is hard to name the scripts sensibly. Lots of them are similarly
named and the name did not tell which test that used them.

The new approach is rather to name them based on the test number that
runs them. Also helps us see which scripts are for individual tests
rather than for general test infra.

 - badsymbols.pl -> test1167.pl
 - check-deprecated.pl -> test1222.pl
 - check-translatable-options.pl -> test1544.pl
 - disable-scan.pl -> test1165.pl
 - error-codes.pl -> test1175.pl
 - errorcodes.pl -> test1477.pl
 - extern-scan.pl -> test1135.pl
 - manpage-scan.pl -> test1139.pl
 - manpage-syntax.pl -> test1173.pl
 - markdown-uppercase.pl -> test1275.pl
 - mem-include-scan.pl -> test1132.pl
 - nroff-scan.pl -> test1140.pl
 - option-check.pl -> test1276.pl
 - options-scan.pl -> test971.pl
 - symbol-scan.pl -> test1119.pl
 - version-scan.pl -> test1177.pl

Closes #12487

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6ae7a97afd93e0c6f00005a4a71f9583823bb7d..b1fc25b0f8cb062013aa7bf043d681a4547e0099 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,21 +22,35 @@
 #
 ###########################################################################
 
-HTMLPAGES = testcurl.html runtests.html
-PDFPAGES = testcurl.pdf runtests.pdf
 MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
-EXTRA_DIST = appveyor.pm azure.pm badsymbols.pl check-deprecated.pl           \
- CMakeLists.txt devtest.pl dictserver.py directories.pm disable-scan.pl       \
- error-codes.pl extern-scan.pl FILEFORMAT.md processhelp.pm ftpserver.pl      \
- getpart.pm globalconfig.pm http-server.pl http2-server.pl http3-server.pl    \
- manpage-scan.pl manpage-syntax.pl markdown-uppercase.pl mem-include-scan.pl  \
- memanalyze.pl negtelnetserver.py nroff-scan.pl option-check.pl               \
- options-scan.pl pathhelp.pm README.md rtspserver.pl runner.pm runtests.1     \
- runtests.pl secureserver.pl serverhelp.pm servers.pm smbserver.py sshhelp.pm \
- sshserver.pl stunnel.pem symbol-scan.pl testcurl.1 testcurl.pl testutil.pm   \
- tftpserver.pl util.py valgrind.pm valgrind.supp version-scan.pl              \
- check-translatable-options.pl errorcodes.pl
+# scripts used in test cases
+TESTSCRIPTS = \
+ test1119.pl  \
+ test1132.pl  \
+ test1135.pl  \
+ test1139.pl  \
+ test1140.pl  \
+ test1165.pl  \
+ test1167.pl  \
+ test1173.pl  \
+ test1175.pl  \
+ test1177.pl  \
+ test1222.pl  \
+ test1275.pl  \
+ test1276.pl  \
+ test1477.pl  \
+ test1544.pl  \
+ test971.pl
+
+EXTRA_DIST = appveyor.pm azure.pm CMakeLists.txt devtest.pl             \
+ dictserver.py directories.pm FILEFORMAT.md processhelp.pm ftpserver.pl \
+ getpart.pm globalconfig.pm http-server.pl http2-server.pl              \
+ http3-server.pl memanalyze.pl negtelnetserver.py pathhelp.pm README.md \
+ rtspserver.pl runner.pm runtests.1 runtests.pl secureserver.pl         \
+ serverhelp.pm servers.pm smbserver.py sshhelp.pm sshserver.pl          \
+ stunnel.pem testcurl.1 testcurl.pl testutil.pm tftpserver.pl util.py   \
+ valgrind.pm valgrind.supp $(TESTSCRIPTS)
 
 DISTCLEANFILES = configurehelp.pm
 

diff --git a/tests/data/test1119 b/tests/data/test1119
index 41f6dba2c16ca559e20d486655071d232b0d4ff9..1a73439e605af87eecc0323a70f7e16c1245204a 100644 (file)
--- a/tests/data/test1119
+++ b/tests/data/test1119
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and headers are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl
+%SRCDIR/test1119.pl %SRCDIR/.. ../include/curl
 </command>
 </client>
 

diff --git a/tests/data/test1132 b/tests/data/test1132
index 613031bac83ddb65538bf1d4acc61a7a57d42f95..e7a802a71a0714a9ea1fa368b07d97fee083c653 100644 (file)
--- a/tests/data/test1132
+++ b/tests/data/test1132
@@ -18,7 +18,7 @@ Verify memory #include files in libcurl's C source files
 </name>
 
 <command type="perl">
-%SRCDIR/mem-include-scan.pl %SRCDIR/../lib
+%SRCDIR/test1132.pl %SRCDIR/../lib
 </command>
 </client>
 

diff --git a/tests/data/test1135 b/tests/data/test1135
index d188989ed6c44cbf4138aa26bd3d3bc8b0b7095e..de028a0c9a99fe4494d259c75cd778762c837684 100644 (file)
--- a/tests/data/test1135
+++ b/tests/data/test1135
@@ -22,7 +22,7 @@ Verify CURL_EXTERN order
 </name>
 
 <command type="perl">
-%SRCDIR/extern-scan.pl %SRCDIR/..
+%SRCDIR/test1135.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1139 b/tests/data/test1139
index b5267b012d771033cee7dd0a33a3202ba3dcd28b..2704e0a2173180560e4c246e7dffc5cd530b0fb2 100644 (file)
--- a/tests/data/test1139
+++ b/tests/data/test1139
@@ -20,7 +20,7 @@ Verify that all libcurl options have man pages
 </name>
 
 <command type="perl">
-%SRCDIR/manpage-scan.pl %SRCDIR/.. %PWD/..
+%SRCDIR/test1139.pl %SRCDIR/.. %PWD/..
 </command>
 </client>
 

diff --git a/tests/data/test1140 b/tests/data/test1140
index 5aa997e78984e77c70f28e18057d739bc6d2f298..fc2a08d0141edaa7c32f605bfa092ebefae02c9d 100644 (file)
--- a/tests/data/test1140
+++ b/tests/data/test1140
@@ -19,7 +19,7 @@ Verify the nroff of man pages
 </name>
 
 <command type="perl">
-%SRCDIR/nroff-scan.pl %SRCDIR/../docs/ %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 %SRCDIR/../docs/*.1
+%SRCDIR/test1140.pl %SRCDIR/../docs/ %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 %SRCDIR/../docs/*.1
 </command>
 </client>
 

diff --git a/tests/data/test1165 b/tests/data/test1165
index de4283af229cfe0cbeebb527454fac24279c8eee..89f02d719c1377cd89dfe373f6c0c24e25968172 100644 (file)
--- a/tests/data/test1165
+++ b/tests/data/test1165
@@ -18,7 +18,7 @@ Verify configure.ac and source code CURL_DISABLE_-sync
 </name>
 
 <command type="perl">
-%SRCDIR/disable-scan.pl %SRCDIR/..
+%SRCDIR/test1165.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1167 b/tests/data/test1167
index 3c2fb1a5f14b74553b8bec35b579653f2577641f..76777f81b7f74f68989f39b8bcad680be7172d72 100644 (file)
--- a/tests/data/test1167
+++ b/tests/data/test1167
@@ -17,7 +17,7 @@ Verify curl prefix of public symbols in header files
 </name>
 
 <command type="perl">
-%SRCDIR/badsymbols.pl %SRCDIR/..
+%SRCDIR/test1167.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1173 b/tests/data/test1173
index b5dafbb3b847a545b275fbb629dd513aca7a3e32..c1dc5c22a8d6a6436d9882f6f1471d8c707e11ff 100644 (file)
--- a/tests/data/test1173
+++ b/tests/data/test1173
@@ -19,7 +19,7 @@ Man page syntax checks
 </name>
 
 <command type="perl">
-%SRCDIR/manpage-syntax.pl %SRCDIR/../docs/libcurl/symbols-in-versions %SRCDIR/../docs/*.1  %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3
+%SRCDIR/test1173.pl %SRCDIR/../docs/libcurl/symbols-in-versions %SRCDIR/../docs/*.1  %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3
 </command>
 </client>
 

diff --git a/tests/data/test1175 b/tests/data/test1175
index 5190dbe2acbe5c0f777425d5e8f1c8a19d2b064f..6e99a616eea19cfb3a758f1740e7d9b822db6da7 100644 (file)
--- a/tests/data/test1175
+++ b/tests/data/test1175
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and libcurl-errors.3 are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/error-codes.pl %SRCDIR
+%SRCDIR/test1175.pl %SRCDIR
 </command>
 </client>
 

diff --git a/tests/data/test1177 b/tests/data/test1177
index 66fe49767bb05bbaeacd37d51e39eb730582da8a..75af5b4c7220639c7eeae01b7a8b573ac952c495 100644 (file)
--- a/tests/data/test1177
+++ b/tests/data/test1177
@@ -18,7 +18,7 @@ Verify that feature names and CURL_VERSION_* in lib and docs are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h %SRCDIR/../lib/version.c
+%SRCDIR/test1177.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h %SRCDIR/../lib/version.c
 </command>
 </client>
 

diff --git a/tests/data/test1222 b/tests/data/test1222
index b56cf6879a7ba96165a3c9a1a375833fb7e93a5c..b46fd11563568bca90c7b6f9e8bb1cbb17d93a5f 100644 (file)
--- a/tests/data/test1222
+++ b/tests/data/test1222
@@ -17,7 +17,7 @@ Verify deprecation statuses and versions
 </name>
 
 <command type="perl">
-%SRCDIR/check-deprecated.pl %SRCDIR/..
+%SRCDIR/test1222.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1275 b/tests/data/test1275
index d1cb223b8bbb31da954f1f0d2f76a32b93d98c46..31893f7ba79b33664b860ab6f5b5b0a263530046 100644 (file)
--- a/tests/data/test1275
+++ b/tests/data/test1275
@@ -18,7 +18,7 @@ Verify capital letters after period in markdown files
 </name>
 
 <command type="perl">
-%SRCDIR/markdown-uppercase.pl %SRCDIR/..
+%SRCDIR/test1275.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1276 b/tests/data/test1276
index 3961bf4cb10b14e5912b7bed746f7fc52a5a9c4a..b365f800af3690a9358c9b52d74314b876db83b4 100644 (file)
--- a/tests/data/test1276
+++ b/tests/data/test1276
@@ -18,7 +18,7 @@ Verify lib/optiontable.pl
 </name>
 
 <command type="perl">
-%SRCDIR/option-check.pl %SRCDIR/..
+%SRCDIR/test1276.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1279 b/tests/data/test1279
index fd3b34bd30994b213eaa10b3c10f8d8d100dc010..041f5449b4a8e46f20a6c62230ff59144f33a4f6 100644 (file)
--- a/tests/data/test1279
+++ b/tests/data/test1279
@@ -19,7 +19,7 @@ Verify libcurl.def against CURL_EXTERN declarations
 </name>
 
 <command type="perl">
-%SRCDIR/extern-scan.pl --heading=EXPORTS --sort %SRCDIR/..
+%SRCDIR/test1135.pl --heading=EXPORTS --sort %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1477 b/tests/data/test1477
index 2771d7f1d3232606fc643e3cc1ff8ce4adc2a699..554ac141f1e313dd381bdafb7b6786a6626ea886 100644 (file)
--- a/tests/data/test1477
+++ b/tests/data/test1477
@@ -17,7 +17,7 @@ Verify that error codes in headers and libcurl-errors.3 are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/errorcodes.pl %SRCDIR/..
+%SRCDIR/test1477.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test1544 b/tests/data/test1544
index f658f5a74937056f88e54302887a9e49bdcf5c64..037caa0ac617091477252ef69282d82a6cac3795 100644 (file)
--- a/tests/data/test1544
+++ b/tests/data/test1544
@@ -17,7 +17,7 @@ Verify all string options are translated by OS/400 wrapper
 </name>
 
 <command type="perl">
-%SRCDIR/check-translatable-options.pl %SRCDIR/..
+%SRCDIR/test1544.pl %SRCDIR/..
 </command>
 </client>
 

diff --git a/tests/data/test971 b/tests/data/test971
index 19260dfdfe443248f31cf5623bc1977470c885b2..6c6b950589ab8d75d749a85778cc28c7a9933d13 100644 (file)
--- a/tests/data/test971
+++ b/tests/data/test971
@@ -18,7 +18,7 @@ Verify that options-in-versions and docs/cmdline-opts are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/options-scan.pl %SRCDIR/../docs/options-in-versions %SRCDIR/../docs/cmdline-opts
+%SRCDIR/test971.pl %SRCDIR/../docs/options-in-versions %SRCDIR/../docs/cmdline-opts
 </command>
 </client>
 

diff --git a/tests/symbol-scan.pl b/tests/test1119.pl
similarity index 100%
rename from tests/symbol-scan.pl
rename to tests/test1119.pl

diff --git a/tests/mem-include-scan.pl b/tests/test1132.pl
similarity index 100%
rename from tests/mem-include-scan.pl
rename to tests/test1132.pl

diff --git a/tests/extern-scan.pl b/tests/test1135.pl
similarity index 100%
rename from tests/extern-scan.pl
rename to tests/test1135.pl

diff --git a/tests/manpage-scan.pl b/tests/test1139.pl
similarity index 100%
rename from tests/manpage-scan.pl
rename to tests/test1139.pl

diff --git a/tests/nroff-scan.pl b/tests/test1140.pl
similarity index 100%
rename from tests/nroff-scan.pl
rename to tests/test1140.pl

diff --git a/tests/disable-scan.pl b/tests/test1165.pl
similarity index 100%
rename from tests/disable-scan.pl
rename to tests/test1165.pl

diff --git a/tests/badsymbols.pl b/tests/test1167.pl
similarity index 100%
rename from tests/badsymbols.pl
rename to tests/test1167.pl

diff --git a/tests/manpage-syntax.pl b/tests/test1173.pl
similarity index 100%
rename from tests/manpage-syntax.pl
rename to tests/test1173.pl

diff --git a/tests/error-codes.pl b/tests/test1175.pl
similarity index 100%
rename from tests/error-codes.pl
rename to tests/test1175.pl

diff --git a/tests/version-scan.pl b/tests/test1177.pl
similarity index 100%
rename from tests/version-scan.pl
rename to tests/test1177.pl

diff --git a/tests/check-deprecated.pl b/tests/test1222.pl
similarity index 100%
rename from tests/check-deprecated.pl
rename to tests/test1222.pl

diff --git a/tests/markdown-uppercase.pl b/tests/test1275.pl
similarity index 100%
rename from tests/markdown-uppercase.pl
rename to tests/test1275.pl

diff --git a/tests/option-check.pl b/tests/test1276.pl
similarity index 100%
rename from tests/option-check.pl
rename to tests/test1276.pl

diff --git a/tests/errorcodes.pl b/tests/test1477.pl
similarity index 100%
rename from tests/errorcodes.pl
rename to tests/test1477.pl

diff --git a/tests/check-translatable-options.pl b/tests/test1544.pl
similarity index 100%
rename from tests/check-translatable-options.pl
rename to tests/test1544.pl

diff --git a/tests/options-scan.pl b/tests/test971.pl
similarity index 100%
rename from tests/options-scan.pl
rename to tests/test971.pl