Commit b5d28c9c authored by Thomas Markwalder's avatar Thomas Markwalder

[master] Fixed distcheck issues with src/bin/admin tests

There were several minor issues related to src/bin/admin tests
that were visible only when distcheck was perfomed with mysql
and/or postgresql enabled.
parent 346b2a28
......@@ -1422,6 +1422,7 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/bin/admin/kea-admin
src/bin/admin/scripts/Makefile
src/bin/admin/tests/Makefile
src/bin/admin/tests/data/Makefile
src/bin/admin/tests/memfile_tests.sh
src/bin/admin/tests/mysql_tests.sh
src/bin/admin/tests/pgsql_tests.sh
......
......@@ -43,7 +43,7 @@ dump_qry=""
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
else
. @abs_top_builddir@/src/bin/admin/admin-utils.sh
. @abs_top_srcdir@/src/bin/admin/admin-utils.sh
fi
# Prints out usage version.
......
SUBDIRS = .
SUBDIRS = data .
SHTESTS = memfile_tests.sh
......
EXTRA_DIST = mysql.lease4_dump_test.reference.csv \
mysql.lease6_dump_test.reference.csv \
pgsql.lease4_dump_test.reference.csv \
pgsql.lease6_dump_test.reference.csv
......@@ -24,7 +24,7 @@ prefix=@prefix@
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
else
. @abs_top_builddir@/src/bin/admin/admin-utils.sh
. @abs_top_srcdir@/src/bin/admin/admin-utils.sh
fi
db_user="keatest"
......@@ -273,9 +273,12 @@ mysql_lease4_dump_test() {
test_start "mysql.lease4_dump_test"
test_dir="@abs_top_srcdir@/src/bin/admin/tests"
output_dir="@abs_top_builddir@/src/bin/admin/tests"
script_dir="@abs_top_srcdir@/src/bin/admin/scripts"
output_file="$test_dir/data/mysql.lease4_dump_test.output.csv"
output_file="$output_dir/data/mysql.lease4_dump_test.output.csv"
tmp_file="$output_file.tmp"
ref_file="$test_dir/data/mysql.lease4_dump_test.reference.csv"
# wipe out any residuals from prior failed runs
......@@ -330,9 +333,12 @@ mysql_lease6_dump_test() {
test_start "mysql.lease6_dump_test"
test_dir="@abs_top_srcdir@/src/bin/admin/tests"
output_dir="@abs_top_builddir@/src/bin/admin/tests"
script_dir="@abs_top_srcdir@/src/bin/admin/scripts"
output_file="$test_dir/data/mysql.lease6_dump_test.output.csv"
output_file="$output_dir/data/mysql.lease6_dump_test.output.csv"
tmp_file="$output_file.tmp"
ref_file="$test_dir/data/mysql.lease6_dump_test.reference.csv"
# wipe out any residuals from prior failed runs
......
......@@ -24,7 +24,7 @@ prefix=@prefix@
if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
. @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
else
. @abs_top_builddir@/src/bin/admin/admin-utils.sh
. @abs_top_srcdir@/src/bin/admin/admin-utils.sh
fi
db_user="keatest"
......@@ -162,10 +162,13 @@ pgsql_lease4_dump_test() {
test_start "pgsql.lease4_dump_test"
test_dir="@abs_top_srcdir@/src/bin/admin/tests"
output_dir="@abs_top_builddir@/src/bin/admin/tests"
script_dir="@abs_top_srcdir@/src/bin/admin/scripts"
output_file="$test_dir/data/pgsql.lease4_dump_test.output.csv"
output_file="$output_dir/data/pgsql.lease4_dump_test.output.csv"
ref_file="$test_dir/data/pgsql.lease4_dump_test.reference.csv"
ref_file_tmp=$ref_file.tmp
ref_file_tmp="$output_dir/data/pgsql.lease4_dump_test.reference.csv.tmp"
# wipe out any residuals from prior failed runs
if [ -e $output_file ]
......@@ -254,10 +257,13 @@ pgsql_lease6_dump_test() {
test_start "pgsql.lease6_dump_test"
test_dir="@abs_top_srcdir@/src/bin/admin/tests"
output_dir="@abs_top_builddir@/src/bin/admin/tests"
script_dir="@abs_top_srcdir@/src/bin/admin/scripts"
output_file="$test_dir/data/pgsql.lease6_dump_test.output.csv"
output_file="$output_dir/data/pgsql.lease6_dump_test.output.csv"
ref_file="$test_dir/data/pgsql.lease6_dump_test.reference.csv"
ref_file_tmp=$ref_file.tmp
ref_file_tmp="$output_dir/data/pgsql.lease6_dump_test.reference.csv.tmp"
# wipe out any residuals from prior failed runs
if [ -e $output_file ]
......
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