From 640f4c2267802730b0eaf6d539f7d0fce3ffc3f6 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 21 Apr 2023 14:07:06 -0700
Subject: [PATCH] runtests: tightened servers package exports

The defaults are intended for runtests.pl, whereas runner.pm needs to
explicitly specify them.
---
 tests/devtest.pl |  7 ++++++-
 tests/runner.pm  | 13 +++++++++----
 tests/servers.pm | 16 +++++++++++++---
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/tests/devtest.pl b/tests/devtest.pl
index 1535423c27..ae6ec090ec 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 a4851b8cfb..69fe323c84 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 fce537efb5..241e0e5d7c 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
         )
     );
 }
-- 
2.47.3