diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-08-23 17:58:41 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-08-23 17:58:41 +0000 |
| commit | db5de45b4ee02fd8c4b4e300f93c395db8f36409 (patch) | |
| tree | 3dbbd285e417cd886c6a495c4e2050e92caeb4c5 /src | |
| parent | ec20b865ce1132955b06bb37219cf68d0a99d455 (diff) | |
| download | krb5-db5de45b4ee02fd8c4b4e300f93c395db8f36409.tar.gz krb5-db5de45b4ee02fd8c4b4e300f93c395db8f36409.tar.xz krb5-db5de45b4ee02fd8c4b4e300f93c395db8f36409.zip | |
* dbtest.c: Include btree.h if we're compiled with -DSTATISTICS
* Makefile.in: Add rules for bttest; also add a clean rule.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14754 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/db2/test/ChangeLog | 7 | ||||
| -rw-r--r-- | src/util/db2/test/Makefile.in | 12 | ||||
| -rw-r--r-- | src/util/db2/test/dbtest.c | 3 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/util/db2/test/ChangeLog b/src/util/db2/test/ChangeLog index 8794fb2bf..c0caa5374 100644 --- a/src/util/db2/test/ChangeLog +++ b/src/util/db2/test/ChangeLog @@ -1,4 +1,11 @@ +2002-08-23 Tom Yu <tlyu@mit.edu> + * dbtest.c: Include btree.h if we're compiled with -DSTATISTICS. + + * Makefile.in: Add rules for bttest; also add a clean rule. + +2002-05-08 Ken Raeburn <raeburn@mit.edu> + * dbtest.c: Test for __STDC__ defined, not nonzero, to decide whether to use stdarg.h or varargs.h. (err): Similarly for function signature. diff --git a/src/util/db2/test/Makefile.in b/src/util/db2/test/Makefile.in index 0b9c2907b..443097f1c 100644 --- a/src/util/db2/test/Makefile.in +++ b/src/util/db2/test/Makefile.in @@ -7,7 +7,7 @@ FCTSH = @FCTSH@ TMPDIR=. LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \ - -I$(srcdir)/../db + -I$(srcdir)/../btree -I$(srcdir)/../hash -I$(srcdir)/../db PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -21,3 +21,13 @@ dbtest: dbtest.o $(DB_DEPLIB) check:: dbtest $(KRB5_RUN_ENV) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(FCTSH) $(srcdir)/run.test + +bttest.o: $(srcdir)/btree.tests/main.c + $(CC) $(ALL_CFLAGS) -c $(srcdir)/btree.tests/main.c -o $@ + +bttest: bttest.o $(DB_DEPLIB) + $(CC_LINK) -o $@ bttest.o $(STRERROR_OBJ) $(DB_LIB) + +clean-unix:: + $(RM) dbtest.o dbtest __dbtest + $(RM) bttest.o bttest diff --git a/src/util/db2/test/dbtest.c b/src/util/db2/test/dbtest.c index ca18378ee..10a89a6fa 100644 --- a/src/util/db2/test/dbtest.c +++ b/src/util/db2/test/dbtest.c @@ -54,6 +54,9 @@ static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94"; #include <unistd.h> #include "db-int.h" +#ifdef STATISTICS +#include "btree.h" +#endif enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA }; |