Commit 1aaae966 authored by Francis Dupont's avatar Francis Dupont
Browse files

[705-wipe_data-sh-and-other-upgrade_-scripts-do-not-set-prefix] Revert...

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

This reverts commit 7fe457cb.

Reviewer asked this to be reverted as overkilling.
parent 5b33ae7d
......@@ -6,7 +6,6 @@
# 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
......
#!/bin/sh
# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2014-2018 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
......
......@@ -6,7 +6,6 @@
# 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
......
#!/bin/sh
# Copyright (C) 2015-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2015-2018 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
......
# Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2016-2017 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.
......
# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2014-2017 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.
......
# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2014-2017 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.
......
#!/bin/sh
# Copyright (C) 2014-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2014-2017 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.
......
......@@ -6,7 +6,6 @@
# 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
......
#!/bin/sh
# Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2018 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.
......
......@@ -4,7 +4,6 @@
# 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.
......
......@@ -803,9 +803,3 @@ 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment