From 14487eda0267622168047674f83c5000dd1c5169 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Fri, 4 Oct 1996 12:34:02 +0000 Subject: [PATCH] Removes the sizes-test.They were bogus as they were checking the sizeof(long) and comparing them to known "4" byte quantities in krb5.h. This fails on 64 bit architectures. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9141 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/unit-test/ChangeLog | 6 ++++++ src/lib/kadm5/unit-test/Makefile.in | 15 ++++----------- src/lib/kadm5/unit-test/sizes-test.c | 21 --------------------- 3 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 src/lib/kadm5/unit-test/sizes-test.c diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index d8399796f..611aec8bd 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 4 08:31:50 1996 Ezra Peisach + + * sizes-test.c: Removed program. + + * Makefile.in: Remove sizes-test. + Tue Oct 1 14:45:37 1996 Ezra Peisach * api.2/init-v2.exp: Remove tests 104 & 105 as lockfile and diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index 915c70ebe..2e22e774c 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -1,7 +1,7 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KADM5_API_VERSION=1 all:: init-test destroy-test client-handle-test client-iter-test -all:: randkey-test server-handle-test lock-test server-iter-test sizes-test +all:: randkey-test server-handle-test lock-test server-iter-test # # The client-side test programs. @@ -12,7 +12,7 @@ init-test: init-test.o client_init.o $(CLNTDEPLIPS) $(CLNTLIBS) client_init.o: $(SRCTOP)/lib/kadm5/clnt/client_init.c - $(CC) $(CFLAGS) -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I$(SRCTOP)/lib/kadm5 $< + $(CC) $(CFLAGS) -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I$(SRCTOP)/lib/kadm5 $(SRCTOP)/lib/kadm5/clnt/client_init.c destroy-test: destroy-test.o $(CLNTDEPLIBS) $(LD) $(LDFLAGS) $(LDARGS) -o destroy-test destroy-test.o $(CLNTLIBS) @@ -42,9 +42,6 @@ lock-test: lock-test.o $(SRVDEPLIBS) server-iter-test: iter-test.o $(SRVDEPLIBS) $(LD) $(LDFLAGS) $(LDARGS) -o server-iter-test iter-test.o $(SRVLIBS) -sizes-test: sizes-test.o $(SRVDEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o sizes-test sizes-test.o $(SRVLIBS) - # # The unit-test targets # @@ -72,9 +69,6 @@ test-noauth: init-test test-destroy: destroy-test $(ENV_SETUP) ./destroy-test -test-sizes: sizes-test - $(ENV_SETUP) ./sizes-test - unit-test-client-setup:: $(ENV_SETUP) $(START_SERVERS) @@ -87,7 +81,7 @@ unit-test-server-setup:: unit-test-server-cleanup:: $(ENV_SETUP) $(STOP_SERVERS_LOCAL) -unit-test-client-body: capi.0 capi.2 site.exp test-noauth test-destroy test-handle-client test-sizes +unit-test-client-body: capi.0 capi.2 site.exp test-noauth test-destroy test-handle-client $(ENV_SETUP) $(RUNTEST) --tool capi API=$(CLNTTCL) KINIT=$(BUILDTOP)/clients/kinit/kinit KDESTROY=$(BUILDTOP)/clients/kdestroy/kdestroy KADMIN_LOCAL=$(BUILDTOP)/kadmin/cli/kadmin.local RPC=1 # @@ -123,7 +117,7 @@ sapi.2: $(srcdir)/api.2 -rm -f $(srcdir)/sapi.2 ln -s $(srcdir)/api.2 $(srcdir)/sapi.2 -unit-test-server-body: sapi.0 sapi.1 sapi.2 site.exp randkey-test test-handle-server lock-test test-sizes +unit-test-server-body: sapi.0 sapi.1 sapi.2 site.exp randkey-test test-handle-server lock-test $(ENV_SETUP) $(RUNTEST) --tool sapi API=$(SRVTCL) LOCKTEST=./lock-test KADMIN_LOCAL=$(BUILDTOP)/kadmin/cli/kadmin.local RPC=0 clean:: @@ -135,5 +129,4 @@ clean:: $(RM) server-handle-test handle-test.o $(RM) lock-test lock-test.o $(RM) server-iter-test iter-test.o - $(RM) sizes-test sizes-test.o $(RM) *.log *.plog *.sum *.psum unit-test-log.* diff --git a/src/lib/kadm5/unit-test/sizes-test.c b/src/lib/kadm5/unit-test/sizes-test.c deleted file mode 100644 index 5bcbd6252..000000000 --- a/src/lib/kadm5/unit-test/sizes-test.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -#define stringify(a) #a - -#define test_size(a,b) if (sizeof(a) != sizeof(b)) { \ - fprintf(stderr, "sizeof(%s) != sizeof(%s)\n", stringify(a), stringify(b)); \ - exit(1); \ -} - -main() -{ - test_size(unsigned long, krb5_ui_4); - test_size(long, krb5_timestamp); - test_size(long, krb5_deltat); - test_size(long, krb5_flags); - - exit(0); -} - -- 2.26.2