[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.

diff --git a/configure.ac b/configure.ac
index 97a20dcabac8692930460257fd3bc040cd272608..93bc9fbc1c164c099e43a16119c49e50dc125af0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 07173309a168f79ef60aaaf8f3f5488362a3827c..8fe539a11b4691e21637a03822feb912aa89ca10 100644 (file)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -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.

diff --git a/src/bin/admin/tests/Makefile.am b/src/bin/admin/tests/Makefile.am
index 4b88a50e5802b6afe4ad23f2516a52a6275c9842..dce6255fb50be6a8d13292fa0615d93b2e0d7a30 100644 (file)
--- a/src/bin/admin/tests/Makefile.am
+++ b/src/bin/admin/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = .
+SUBDIRS = data .
 
 SHTESTS = memfile_tests.sh
 

diff --git a/src/bin/admin/tests/data/Makefile.am b/src/bin/admin/tests/data/Makefile.am
new file mode 100644 (file)
index 0000000..49f48c2
--- /dev/null
+++ b/src/bin/admin/tests/data/Makefile.am
@@ -0,0 +1,4 @@
+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

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 0ce5bf22ffc42f5dd906efeabc1f3b1434e94fd7..deb87e8c875cc64ea526d05a60a3b1b0d76ca725 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -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

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index 2335b84b9ec331842449d9641a17e4a1ae08a8ae..96326670bf8031050f209656a2702433d1e115a3 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -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 ]