diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2023-04-21 14:07:06 -0700 |
---|---|---|
committer | Dan Fandrich <dan@coneharvesters.com> | 2023-04-24 16:04:24 -0700 |
commit | 640f4c2267802730b0eaf6d539f7d0fce3ffc3f6 (patch) | |
tree | 0e1e4c9c3aad6745b54074d21d3708aafe90131a | |
parent | 8da49c9e3881fa93f29f244647a0c3985dce14a1 (diff) | |
download | curl-640f4c2267802730b0eaf6d539f7d0fce3ffc3f6.tar.gz |
runtests: tightened servers package exports
The defaults are intended for runtests.pl, whereas runner.pm needs to
explicitly specify them.
-rwxr-xr-x | tests/devtest.pl | 7 | ||||
-rw-r--r-- | tests/runner.pm | 13 | ||||
-rw-r--r-- | tests/servers.pm | 16 |
3 files changed, 28 insertions, 8 deletions
diff --git a/tests/devtest.pl b/tests/devtest.pl index 1535423c2..ae6ec090e 100755 --- a/tests/devtest.pl +++ b/tests/devtest.pl @@ -49,7 +49,12 @@ BEGIN { } use globalconfig; -use servers; +use servers qw( + initserverconfig + protoport + serverfortest + stopservers +); use runner qw( readtestkeywords singletest_preprocess diff --git a/tests/runner.pm b/tests/runner.pm index a4851b8cf..69fe323c8 100644 --- a/tests/runner.pm +++ b/tests/runner.pm @@ -33,19 +33,19 @@ BEGIN { use base qw(Exporter); our @EXPORT = qw( + checktestcmd prepro restore_test_env runner_test_preprocess runner_test_run - checktestcmd $DBGCURL + $gdb $gdbthis $gdbxwin $shallow $tortalloc $valgrind_logfile $valgrind_tool - $gdb ); # these are for debugging only @@ -61,8 +61,13 @@ use pathhelp qw( use processhelp qw( portable_sleep ); - -use servers; +use servers qw( + checkcmd + serverfortest + stopserver + stopservers + subvariables + ); use getpart; use globalconfig; use testutil; diff --git a/tests/servers.pm b/tests/servers.pm index fce537efb..241e0e5d7 100644 --- a/tests/servers.pm +++ b/tests/servers.pm @@ -54,14 +54,24 @@ BEGIN { # functions qw( + clearlocks initserverconfig + stopservers + ) + ); + + our @EXPORT_OK = ( + # functions + qw( checkcmd - clearlocks - protoport serverfortest stopserver - stopservers subvariables + ), + + # for debugging only + qw( + protoport ) ); } |