Fix testing with DejaGNU 1.6.3

DejaGNU starting from version 1.6.3 looks for the testsuite in the
directory testsuite.

See https://puszcza.gnu.org.ua/bugs/index.php?519

* configure.ac: Register tests/gdbmtool/Makefile
* tests/Makefile.am: Move dejagnu tests to the gdbmtool subdir.
* tests/gdbmtool/Makefile.am: New file.
* tests/config/default.exp: Move to tests/gdbmtool/config/default.exp
* tests/gdbmtool/base.exp: Move to tests/gdbmtool/testsuite/gdbmtool/base.exp

5 files changed, 35 insertions, 33 deletions

diff --git a/configure.ac b/configure.ac
index 2c22ace..4a2733f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,7 @@ AM_CONDITIONAL([COND_GDBMTOOL_DEBUG], [test "$want_gdbmtool_debug" = yes])
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/Makefile tests/atlocal po/Makefile.in])
+AC_CONFIG_FILES([tests/gdbmtool/Makefile])
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
 AC_CONFIG_COMMANDS([status],[
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1caa76e..337cbed 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,37 +137,5 @@ dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
 dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
 d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
 
-## -------------------- ##
-## DejaGNU Test suite.  ##
-## -------------------- ##
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = gdbmtool
-RUNTESTFLAGS = 
-CLEANFILES = *.log
-
-site.exp: Makefile
-	@echo 'Making a new site.exp file...'
-	@test ! -f site.bak || rm -f site.bak
-	@echo '## these variables are automatically generated by make ##' > $@-t
-	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
-	@echo '# edit the last section' >> $@-t
-	@echo 'set tool $(DEJATOOL)' >> $@-t
-	@echo "set top_srcdir `cd $(top_srcdir); pwd`" >> $@-t
-	@echo "set top_builddir `cd $(top_builddir); pwd`" >> $@-t
-	@echo "set srcdir `cd $(srcdir); pwd`" >> $@-t
-	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set host_alias "$(host_alias)"' >> $@-t
-	@echo 'set host_triplet $(host_triplet)' >> $@-t
-	@echo 'set target_alias "$(target_alias)"' >> $@-t
-	@echo 'set target_triplet $(target_triplet)' >> $@-t
-	@echo 'set build_alias "$(build_alias)"' >> $@-t
-	@echo 'set build_triplet $(build_triplet)' >> $@-t
-	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
-	@test ! -f site.exp || mv site.exp site.bak
-	@mv $@-t site.exp
-
-EXTRA_DIST += \
-  gdbmtool/base.exp\
-  config/default.exp
+SUBDIRS = gdbmtool
 
diff --git a/tests/gdbmtool/Makefile.am b/tests/gdbmtool/Makefile.am
new file mode 100644
index 0000000..6775f7f
--- /dev/null
+++ b/tests/gdbmtool/Makefile.am
@@ -0,0 +1,33 @@
+## -------------------- ##
+## DejaGNU Test suite.  ##
+## -------------------- ##
+AUTOMAKE_OPTIONS = dejagnu
+DEJATOOL = gdbmtool
+RUNTESTFLAGS = 
+CLEANFILES = *.log
+
+site.exp: Makefile
+	@echo 'Making a new site.exp file...'
+	@test ! -f site.bak || rm -f site.bak
+	@echo '## these variables are automatically generated by make ##' > $@-t
+	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
+	@echo '# edit the last section' >> $@-t
+	@echo 'set tool $(DEJATOOL)' >> $@-t
+	@echo "set top_srcdir `cd $(top_srcdir); pwd`" >> $@-t
+	@echo "set top_builddir `cd $(top_builddir); pwd`" >> $@-t
+	@echo "set srcdir `cd $(srcdir); pwd`" >> $@-t
+	@echo 'set objdir' `pwd` >> $@-t
+	@echo 'set host_alias "$(host_alias)"' >> $@-t
+	@echo 'set host_triplet $(host_triplet)' >> $@-t
+	@echo 'set target_alias "$(target_alias)"' >> $@-t
+	@echo 'set target_triplet $(target_triplet)' >> $@-t
+	@echo 'set build_alias "$(build_alias)"' >> $@-t
+	@echo 'set build_triplet $(build_triplet)' >> $@-t
+	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
+	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
+	@test ! -f site.exp || mv site.exp site.bak
+	@mv $@-t site.exp
+
+EXTRA_DIST = \
+  testsuite/gdbmtool/base.exp\
+  config/default.exp
diff --git a/tests/config/default.exp b/tests/gdbmtool/config/default.exp
index 7802ea6..7802ea6 100644
--- a/tests/config/default.exp
+++ b/tests/gdbmtool/config/default.exp
diff --git a/tests/gdbmtool/base.exp b/tests/gdbmtool/testsuite/gdbmtool/base.exp
index 84128d2..84128d2 100644
--- a/tests/gdbmtool/base.exp
+++ b/tests/gdbmtool/testsuite/gdbmtool/base.exp