summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1996-10-03 17:26:46 +0000
committerEzra Peisach <epeisach@mit.edu>1996-10-03 17:26:46 +0000
commitfd59bdc37c644d1486938253bff717be25940de0 (patch)
tree77bb505f8efb3ef9fa32d3a0c15fa0f7909c2a76
parent681fb9a54e8caeebbcda223617c4844e6a9ec799 (diff)
downloadkrb5-fd59bdc37c644d1486938253bff717be25940de0.tar.gz
krb5-fd59bdc37c644d1486938253bff717be25940de0.tar.xz
krb5-fd59bdc37c644d1486938253bff717be25940de0.zip
* pre.in: Separate KADM5 unit test files to source dir and build
dir based on how generated. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9139 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/config/ChangeLog5
-rw-r--r--src/config/pre.in17
2 files changed, 14 insertions, 8 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index b18bf85989..6b444da699 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 3 13:08:40 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * pre.in: Separate KADM5 unit test files to source dir and build
+ dir based on how generated.
+
Mon Sep 23 15:40:04 1996 Barry Jaspan <bjaspan@mit.edu>
* pre.in (DEJAFLAGS): set --srcdir $(srcdir) so unit test files
diff --git a/src/config/pre.in b/src/config/pre.in
index 632480b443..2cf5d4ed4a 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -74,14 +74,15 @@ KRB5_INCSUBDIRS = \
# XXX check which of these are actually used!
#
TESTDIR = $(BUILDTOP)/kadmin/testing
+STESTDIR = $(SRCTOP)/kadmin/testing
COMPARE_DUMP = $(TESTDIR)/scripts/compare_dump.pl
FIX_CONF_FILES = $(TESTDIR)/scripts/fixup-conf-files.pl
-INITDB = $(TESTDIR)/scripts/init_db
+INITDB = $(STESTDIR)/scripts/init_db
MAKE_KEYTAB = $(TESTDIR)/scripts/make-host-keytab.pl
LOCAL_MAKE_KEYTAB= $(TESTDIR)/scripts/make-host-keytab.pl
-RESTORE_FILES = $(TESTDIR)/scripts/restore_files.sh
-SAVE_FILES = $(TESTDIR)/scripts/save_files.sh
-ENV_SETUP = TOP=$(BUILDTOP)/kadmin $(TESTDIR)/scripts/env-setup.sh
+RESTORE_FILES = $(STESTDIR)/scripts/restore_files.sh
+SAVE_FILES = $(STESTDIR)/scripts/save_files.sh
+ENV_SETUP = $(TESTDIR)/scripts/env-setup.sh
CLNTTCL = $(TESTDIR)/util/ovsec_kadm_clnt_tcl
SRVTCL = $(TESTDIR)/util/ovsec_kadm_srv_tcl
# Dejagnu variables.
@@ -92,11 +93,11 @@ DEJAFLAGS := $(DEJALFLAGS) $(CLFLAGS) --debug --srcdir $(srcdir) --host \
unknown-$(shell uname -m)-$(shell uname -s)$(shell uname -r)
RUNTEST = runtest $(DEJAFLAGS)
-START_SERVERS = $(TESTDIR)/scripts/start_servers $(TEST_SERVER)
-START_SERVERS_LOCAL = $(TESTDIR)/scripts/start_servers_local
+START_SERVERS = $(STESTDIR)/scripts/start_servers $(TEST_SERVER)
+START_SERVERS_LOCAL = $(STESTDIR)/scripts/start_servers_local
-STOP_SERVERS = $(TESTDIR)/scripts/stop_servers $(TEST_SERVER)
-STOP_SERVERS_LOCAL = $(TESTDIR)/scripts/stop_servers_local
+STOP_SERVERS = $(STESTDIR)/scripts/stop_servers $(TEST_SERVER)
+STOP_SERVERS_LOCAL = $(STESTDIR)/scripts/stop_servers_local
#
# End of macros for the KADM5 unit test system.
#