[705-wipe_data-sh-and-other-upgrade_-scripts-do-not-set-prefix] Protected dhcp_test_lib.sh against unset ${prefix} and fixed includers

src/bin/admin/tests/cql_tests.sh.in

@@ -6,6 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Include common test library.
 . @abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh
 

src/bin/admin/tests/memfile_tests.sh.in

@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Include common test library.
 . @abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh
 

src/bin/admin/tests/mysql_tests.sh.in

@@ -6,6 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Include common test library.
 . @abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh
 

src/bin/admin/tests/pgsql_tests.sh.in

@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Include common test library.
 . @abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh
 

src/bin/agent/tests/ca_process_tests.sh.in

@@ -1,9 +1,10 @@
-# Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Path to the temporary configuration file.
 CFG_FILE=@abs_top_builddir@/src/bin/agent/tests/test_config.json
 # Path to the Control Agent log file.

src/bin/d2/tests/d2_process_tests.sh.in

@@ -1,9 +1,10 @@
-# Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Path to the temporary configuration file.
 CFG_FILE=@abs_top_builddir@/src/bin/d2/tests/test_config.json
 # Path to the D2 log file.

src/bin/dhcp4/tests/dhcp4_process_tests.sh.in

@@ -1,9 +1,10 @@
-# Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Path to the temporary configuration file.
 CFG_FILE=@abs_top_builddir@/src/bin/dhcp4/tests/test_config.json
 # Path to the Kea log file.

src/bin/dhcp6/tests/dhcp6_process_tests.sh.in

@@ -1,9 +1,12 @@
-# Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
+#!/bin/sh
+
+# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Path to the temporary configuration file.
 CFG_FILE=@abs_top_builddir@/src/bin/dhcp6/tests/test_config.json
 # Path to the Kea log file.

src/bin/keactrl/tests/keactrl_tests.sh.in

@@ -6,6 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Include common test library.
 . @abs_top_builddir@/src/lib/testutils/dhcp_test_lib.sh
 

src/bin/netconf/tests/shtests/netconf_tests.sh.in

@@ -1,9 +1,12 @@
-# Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+#!/bin/sh
+
+# Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Path to the temporary configuration file.
 CFG_FILE=@abs_top_builddir@/src/bin/netconf/tests/shtests/test_config.json
 # Path to the Kea log file.

src/bin/shell/tests/shell_process_tests.sh.in

@@ -4,6 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+prefix=@prefix@
 # Path to the temporary configuration file.
 CFG_FILE=@abs_top_builddir@/src/bin/shell/tests/test_config.json
 # Path to the Control Agent log file.

src/lib/testutils/dhcp_test_lib.sh.in

@@ -803,3 +803,9 @@ server_pid_file_test() {
     # All ok. Shut down the server and exit.
     test_finish 0
 }
+
+# Verify that prefix was set by the includer.
+if [ -z ${prefix+x} ]; then
+    printf "internal error: \${prefix} must be set\n"
+    clean_exit 1
+fi