Build tests subtree makefiles at top level

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19274 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/configure.in b/src/configure.in
index 5ab463272cd6048a32e0f9b0edfa327ab1dbf048..fe692f9e694c9e5b3176c037cb5a6af2bca0a4e8 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -844,6 +844,22 @@ case "$krb5_cv_host" in
 esac
 changequote([, ])
 AC_SUBST(PASS)
+
+dnl for tests/
+if test x"$RUNTEST" != x; then
+       HAVE_RUNTEST=yes
+else
+       HAVE_RUNTEST=no
+fi
+AC_SUBST(HAVE_RUNTEST)
+if test "$KRB4_LIB" = ''; then
+       KRB4_DEJAGNU_TEST="KRBIV=0"
+else
+       AC_MSG_RESULT(Kerberos 4 testing enabled)
+       KRB4_DEJAGNU_TEST="KRBIV=1"
+fi
+AC_SUBST(KRB4_DEJAGNU_TEST)
+
 dnl
 dnl
 dnl Check for thread safety issues.
@@ -919,7 +935,7 @@ if test -n "$OPENLDAP_PLUGIN"; then
 fi
 AC_SUBST(ldap_plugin_dir)
 
-AC_CONFIG_SUBDIRS(plugins/kdb/db2 plugins/preauth/wpse plugins/preauth/cksum_body appl tests)
+AC_CONFIG_SUBDIRS(plugins/kdb/db2 plugins/preauth/wpse plugins/preauth/cksum_body)
 
 AC_CHECK_HEADERS(Python.h python2.3/Python.h)
 
@@ -973,4 +989,8 @@ V5_AC_OUTPUT_MAKEFILE(.
        appl/sample appl/sample/sclient appl/sample/sserver
        appl/simple appl/simple/client appl/simple/server
        appl/gss-sample appl/user_user
+
+       tests tests/resolve tests/asn.1 tests/create tests/hammer
+       tests/verify tests/gssapi tests/dejagnu tests/threads tests/shlib
+       tests/gss-threads tests/misc
 )

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 89cbb042b45be144d0a99d9d570e163cfd3ba6bd..a02346c4815eee56e52950b7c1aef43f6f1c7708 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,5 +1,5 @@
-thisconfigdir=.
-mydir=.
+thisconfigdir=..
+mydir=tests
 myfulldir=tests
 BUILDTOP=$(REL)..
 LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \

diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 202153b066de6b053104c9c7801036aa2a316494..7c7b1b107868f76176aa15d623be23b620bc7934 100644 (file)
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/asn.1
-mydir=asn.1
+mydir=tests/asn.1
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/tests/configure.in b/src/tests/configure.in
deleted file mode 100644 (file)
index 9b8619b..0000000
--- a/src/tests/configure.in
+++ /dev/null
@@ -1,30 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-dnl Set krb5_cv_host
-KRB5_LIB_PARAMS
-dnl
-AC_HEADER_STDC
-AC_CHECK_FUNCS(strchr sem_init sem_trywait)
-AC_CHECK_HEADERS(unistd.h stdlib.h sys/param.h sys/socket.h dlfcn.h semaphore.h)
-AC_C_CONST
-AC_PROG_INSTALL
-AC_CHECK_PROG(RUNTEST,runtest,runtest)
-if test x"$RUNTEST" != x; then
-       HAVE_RUNTEST=yes
-else
-       HAVE_RUNTEST=no
-fi
-AC_SUBST(HAVE_RUNTEST)
-AC_TYPE_SIGNAL
-CHECK_SIGNALS
-if test "$KRB4_LIB" = ''; then
-       KRB4_DEJAGNU_TEST="KRBIV=0"
-else
-       AC_MSG_RESULT(Kerberos 4 testing enabled)
-       KRB4_DEJAGNU_TEST="KRBIV=1"
-fi
-AC_SUBST(KRB4_DEJAGNU_TEST)
-KRB5_AC_PRIOCNTL_HACK
-V5_AC_OUTPUT_MAKEFILE(. resolve asn.1 create hammer verify gssapi dejagnu threads shlib gss-threads misc)

diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index ff7aa88e49b1f04eb4ad5c136e63b3e6456fa347..ae41e1d79b4709ae5a5bbde786136175f3af1f8c 100644 (file)
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/create
-mydir=create
+mydir=tests/create
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 61fbed088fa1c929ea3718ac2d6033ad3bcd8178..ebd3eb63ad1352dfc31b5d2db996395eee2ba98d 100644 (file)
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/dejagnu
-mydir=dejagnu
+mydir=tests/dejagnu
 BUILDTOP=$(REL)..$(S)..
 RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =

diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in
index b95cbcd1b637fe169d0ba14b1774dab38eab42ab..24357045f4d3fa51d2f4580fdd6dea501c5001b0 100644 (file)
--- a/src/tests/gss-threads/Makefile.in
+++ b/src/tests/gss-threads/Makefile.in
@@ -1,8 +1,8 @@
 # Derived from appl/gss-sample, January 2005.
 
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/gss-threads
-mydir=gss-threads
+mydir=tests/gss-threads
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index 846a2411ce5ee906555e825a05695101534350a3..19c6fd33e5b54202284ad6b93825314b9fccc99a 100644 (file)
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/gssapi
-mydir=gssapi
+mydir=tests/gssapi
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index 4bf6153f41addc1c886692a932ff3068fda389e5..0c499efd5388b431a6ce350f2ad7fe1a2173cdef 100644 (file)
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/hammer
-mydir=hammer
+mydir=tests/hammer
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in
index a22acde1c3587a4f7435bca0204096583d913d37..0dc4260ebc9ba50105230b77ebdd49462656e51a 100644 (file)
--- a/src/tests/misc/Makefile.in
+++ b/src/tests/misc/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/misc
-mydir=misc
+mydir=tests/misc
 BUILDTOP=$(REL)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index e023b8e6ee5e5ed8336bae2050faf082007bfccc..94d69a1916ba5a84e7875ff07a33e1583b5eda9e 100644 (file)
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/resolve
-mydir=resolve
+mydir=tests/resolve
 BUILDTOP=$(REL)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index 523dd125a673cd1e60c4b25d9020b7f9f61af8cb..6b8bb6f037361f31bbd8c56d455a4897c6ede72c 100644 (file)
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/shlib
-mydir=shlib
+mydir=tests/shlib
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in
index b6da0b087dc10f4823c25e9040caeaa163dfff7c..62ba58977953a78d5072b66aaa8e506a6aaf48c3 100644 (file)
--- a/src/tests/threads/Makefile.in
+++ b/src/tests/threads/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/threads
-mydir=threads
+mydir=tests/threads
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 6ede30510d4c35f099a3c10975c18051db8b122a..61b78f9c57d47c3dfc595cfb4d1d95b68db3bcef 100644 (file)
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
 myfulldir=tests/verify
-mydir=verify
+mydir=tests/verify
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)