krb5 commit: Move test utilities out of dejagnu subdirectory
Greg Hudson <[email protected]>
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/7e83975575b4ad041f2e294f343a3c97346fba1f commit 7e83975575b4ad041f2e294f343a3c97346fba1f Author: Greg Hudson <[email protected]> Date: Thu May 20 21:45:56 2021 -0400 Move test utilities out of dejagnu subdirectory Move pkinit-certs, proxy-certs, and t_inetd.c from tests/dejagnu to tests and repoint references at the new locations. .gitignore | 2 +- src/tests/Makefile.in | 13 ++- src/tests/dejagnu/Makefile.in | 11 +- src/tests/dejagnu/config/default.exp | 4 +- src/tests/dejagnu/deps | 6 +- src/tests/dejagnu/pkinit-certs/ca.pem | 29 ---- src/tests/dejagnu/pkinit-certs/generic.p12 | Bin 2477 -> 0 bytes src/tests/dejagnu/pkinit-certs/generic.pem | 21 --- src/tests/dejagnu/pkinit-certs/kdc.pem | 29 ---- src/tests/dejagnu/pkinit-certs/make-certs.sh | 177 ---------------------- src/tests/dejagnu/pkinit-certs/privkey-enc.pem | 30 ---- src/tests/dejagnu/pkinit-certs/privkey.pem | 27 ---- src/tests/dejagnu/pkinit-certs/user-enc.p12 | Bin 2837 -> 0 bytes src/tests/dejagnu/pkinit-certs/user-upn.p12 | Bin 2829 -> 0 bytes src/tests/dejagnu/pkinit-certs/user-upn.pem | 28 ---- src/tests/dejagnu/pkinit-certs/user-upn2.p12 | Bin 2813 -> 0 bytes src/tests/dejagnu/pkinit-certs/user-upn2.pem | 28 ---- src/tests/dejagnu/pkinit-certs/user-upn3.p12 | Bin 2829 -> 0 bytes src/tests/dejagnu/pkinit-certs/user-upn3.pem | 28 ---- src/tests/dejagnu/pkinit-certs/user.p12 | Bin 2837 -> 0 bytes src/tests/dejagnu/pkinit-certs/user.pem | 28 ---- src/tests/dejagnu/proxy-certs/ca.pem | 28 ---- src/tests/dejagnu/proxy-certs/make-certs.sh | 124 --------------- src/tests/dejagnu/proxy-certs/proxy-badsig.pem | 56 ------- src/tests/dejagnu/proxy-certs/proxy-ideal.pem | 56 ------- src/tests/dejagnu/proxy-certs/proxy-no-match.pem | 54 ------- src/tests/dejagnu/proxy-certs/proxy-san.pem | 56 ------- src/tests/dejagnu/proxy-certs/proxy-subject.pem | 54 ------- src/tests/dejagnu/t_inetd.c | 142 ----------------- src/tests/deps | 2 + src/tests/pkinit-certs/ca.pem | 29 ++++ src/tests/pkinit-certs/generic.p12 | Bin 0 -> 2477 bytes src/tests/pkinit-certs/generic.pem | 21 +++ src/tests/pkinit-certs/kdc.pem | 29 ++++ src/tests/pkinit-certs/make-certs.sh | 177 ++++++++++++++++++++++ src/tests/pkinit-certs/privkey-enc.pem | 30 ++++ src/tests/pkinit-certs/privkey.pem | 27 ++++ src/tests/pkinit-certs/user-enc.p12 | Bin 0 -> 2837 bytes src/tests/pkinit-certs/user-upn.p12 | Bin 0 -> 2829 bytes src/tests/pkinit-certs/user-upn.pem | 28 ++++ src/tests/pkinit-certs/user-upn2.p12 | Bin 0 -> 2813 bytes src/tests/pkinit-certs/user-upn2.pem | 28 ++++ src/tests/pkinit-certs/user-upn3.p12 | Bin 0 -> 2829 bytes src/tests/pkinit-certs/user-upn3.pem | 28 ++++ src/tests/pkinit-certs/user.p12 | Bin 0 -> 2837 bytes src/tests/pkinit-certs/user.pem | 28 ++++ src/tests/proxy-certs/ca.pem | 28 ++++ src/tests/proxy-certs/make-certs.sh | 124 +++++++++++++++ src/tests/proxy-certs/proxy-badsig.pem | 56 +++++++ src/tests/proxy-certs/proxy-ideal.pem | 56 +++++++ src/tests/proxy-certs/proxy-no-match.pem | 54 +++++++ src/tests/proxy-certs/proxy-san.pem | 56 +++++++ src/tests/proxy-certs/proxy-subject.pem | 54 +++++++ src/tests/t_authdata.py | 2 +- src/tests/t_certauth.py | 2 +- src/tests/t_inetd.c | 142 +++++++++++++++++ src/tests/t_pkinit.py | 2 +- src/tests/t_proxy.py | 18 +-- src/util/k5test.py | 2 +- 59 files changed, 1025 insertions(+), 1029 deletions(-) diff --git a/.gitignore b/.gitignore index b40f467..c37b33d 100644 --- a/.gitignore +++ b/.gitignore @@ -422,6 +422,7 @@ local.properties /src/tests/s2p /src/tests/s4u2proxy /src/tests/s4u2self +/src/tests/t_inetd /src/tests/unlockiter /src/tests/asn.1/expected_encode.out @@ -440,7 +441,6 @@ local.properties /src/tests/dejagnu/krb.sum /src/tests/dejagnu/runenv.vals /src/tests/dejagnu/site.exp -/src/tests/dejagnu/t_inetd /src/tests/dejagnu/tmpdir/ /src/tests/gss-threads/gss-client diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index ab416cc..02a3cc0 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -8,10 +8,12 @@ RUN_DB_TEST = $(RUN_SETUP) KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf \ OBJS= adata.o etinfo.o forward.o gcred.o hist.o hooks.o hrealm.o \ icinterleave.o icred.o kdbtest.o localauth.o plugorder.o rdreq.o \ - replay.o responder.o s2p.o s4u2self.o s4u2proxy.o unlockiter.o + replay.o responder.o s2p.o s4u2self.o s4u2proxy.o t_inetd.o \ + unlockiter.o EXTRADEPSRCS= adata.c etinfo.c forward.c gcred.c hist.c hooks.c hrealm.c \ icinterleave.c icred.c kdbtest.c localauth.c plugorder.c rdreq.c \ - replay.c responder.c s2p.c s4u2self.c s4u2proxy.c unlockiter.c + replay.c responder.c s2p.c s4u2self.c s4u2proxy.c t_inetd.c \ + unlockiter.c TEST_DB = ./testdb TEST_REALM = FOO.TEST.REALM @@ -78,10 +80,15 @@ s4u2self: s4u2self.o $(KRB5_BASE_DEPLIBS) s4u2proxy: s4u2proxy.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ s4u2proxy.o $(KRB5_BASE_LIBS) +t_inetd: t_inetd.o $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $@ t_inetd.o $(LIBS) $(KRB5_BASE_LIBS) + unlockiter: unlockiter.o $(KDB5_DEPLIBS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o $@ unlockiter.o $(KDB5_LIBS) $(KADMSRV_LIBS) \ $(KRB5_BASE_LIBS) +all-unix: t_inetd + check-unix: kdb_check kdc.conf: Makefile @@ -184,7 +191,7 @@ check-pytests: unlockiter s4u2self clean: $(RM) adata etinfo forward gcred hist hooks hrealm icinterleave icred $(RM) kdbtest localauth plugorder rdreq replay responder s2p s4u2proxy - $(RM) unlockiter s4u2self + $(RM) s4u2self t_inetd unlockiter $(RM) krb5.conf kdc.conf $(RM) -rf kdc_realm/sandbox ldap $(RM) au.log diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in index e78e270..8c301c5 100644 --- a/src/tests/dejagnu/Makefile.in +++ b/src/tests/dejagnu/Makefile.in @@ -3,9 +3,7 @@ BUILDTOP=$(REL)..$(S).. RUNTEST = @RUNTEST@ $(DEJAFLAGS) RUNTESTFLAGS = -SRCS=$(srcdir)/t_inetd.c - -all: t_inetd +all: install: @@ -19,14 +17,11 @@ check-runtest-no: @echo 'Skipped dejagnu tests: runtest not found' >> $(SKIPTESTS) # Set VALGRIND at run time, that may be changed when running 'make'. -check-runtest-yes: t_inetd site.exp +check-runtest-yes: site.exp $(RUNTEST) --tool krb VALGRIND="$(VALGRIND)" $(RUNTESTFLAGS) -t_inetd: t_inetd.o $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS) - clean: - $(RM) t_inetd t_inetd.o site.exp runenv.vars runenv.vals + $(RM) site.exp runenv.vars runenv.vals clean-unix:: $(RM) -rf tmpdir dbg.log krb.log krb.sum diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 85bbf47..c298066 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -303,7 +303,7 @@ foreach i { {KTUTIL $objdir/../../kadmin/ktutil/ktutil} {KLIST $objdir/../../clients/klist/klist} {KDESTROY $objdir/../../clients/kdestroy/kdestroy} - {T_INETD $objdir/t_inetd} + {T_INETD $objdir/../t_inetd} {KPROPLOG $objdir/../../kprop/kproplog} {KPASSWD $objdir/../../clients/kpasswd/kpasswd} {KPROPD $objdir/../../kprop/kpropd} @@ -735,7 +735,7 @@ proc setup_krb5_conf { {type client} } { global srcdir global env - set pkinit_certs [findfile "[pwd]/$srcdir/pkinit-certs" "[pwd]/$srcdir/pkinit-certs" "$srcdir/pkinit-certs"] + set pkinit_certs [findfile "[pwd]/$srcdir/../pkinit-certs" "$srcdir/../pkinit-certs"] # Create a krb5.conf file. if { ![file exists $tmppwd/krb5.$type.conf] \ || $last_passname_conf != $multipass_name } { diff --git a/src/tests/dejagnu/deps b/src/tests/dejagnu/deps index 5ad2538..2feac3c 100644 --- a/src/tests/dejagnu/deps +++ b/src/tests/dejagnu/deps @@ -1,5 +1 @@ -# -# Generated makefile dependencies follow. -# -$(OUTPRE)t_inetd.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(COM_ERR_DEPS) t_inetd.c +# No dependencies here. diff --git a/src/tests/deps b/src/tests/deps index 8028430..2a6982f 100644 --- a/src/tests/deps +++ b/src/tests/deps @@ -163,6 +163,8 @@ $(OUTPRE)s4u2proxy.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/port-sockets.h \ $(top_srcdir)/include/socket-utils.h s4u2proxy.c +$(OUTPRE)t_inetd.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(COM_ERR_DEPS) t_inetd.c $(OUTPRE)unlockiter.$(OBJEXT): $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/kadm_err.h \ diff --git a/src/tests/dejagnu/pkinit-certs/ca.pem b/src/tests/pkinit-certs/ca.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/ca.pem rename to src/tests/pkinit-certs/ca.pem diff --git a/src/tests/dejagnu/pkinit-certs/generic.p12 b/src/tests/pkinit-certs/generic.p12 similarity index 100% rename from src/tests/dejagnu/pkinit-certs/generic.p12 rename to src/tests/pkinit-certs/generic.p12 diff --git a/src/tests/dejagnu/pkinit-certs/generic.pem b/src/tests/pkinit-certs/generic.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/generic.pem rename to src/tests/pkinit-certs/generic.pem diff --git a/src/tests/dejagnu/pkinit-certs/kdc.pem b/src/tests/pkinit-certs/kdc.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/kdc.pem rename to src/tests/pkinit-certs/kdc.pem diff --git a/src/tests/dejagnu/pkinit-certs/make-certs.sh b/src/tests/pkinit-certs/make-certs.sh similarity index 100% rename from src/tests/dejagnu/pkinit-certs/make-certs.sh rename to src/tests/pkinit-certs/make-certs.sh diff --git a/src/tests/dejagnu/pkinit-certs/privkey-enc.pem b/src/tests/pkinit-certs/privkey-enc.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/privkey-enc.pem rename to src/tests/pkinit-certs/privkey-enc.pem diff --git a/src/tests/dejagnu/pkinit-certs/privkey.pem b/src/tests/pkinit-certs/privkey.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/privkey.pem rename to src/tests/pkinit-certs/privkey.pem diff --git a/src/tests/dejagnu/pkinit-certs/user-enc.p12 b/src/tests/pkinit-certs/user-enc.p12 similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-enc.p12 rename to src/tests/pkinit-certs/user-enc.p12 diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.p12 b/src/tests/pkinit-certs/user-upn.p12 similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-upn.p12 rename to src/tests/pkinit-certs/user-upn.p12 diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.pem b/src/tests/pkinit-certs/user-upn.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-upn.pem rename to src/tests/pkinit-certs/user-upn.pem diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.p12 b/src/tests/pkinit-certs/user-upn2.p12 similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-upn2.p12 rename to src/tests/pkinit-certs/user-upn2.p12 diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.pem b/src/tests/pkinit-certs/user-upn2.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-upn2.pem rename to src/tests/pkinit-certs/user-upn2.pem diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.p12 b/src/tests/pkinit-certs/user-upn3.p12 similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-upn3.p12 rename to src/tests/pkinit-certs/user-upn3.p12 diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.pem b/src/tests/pkinit-certs/user-upn3.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user-upn3.pem rename to src/tests/pkinit-certs/user-upn3.pem diff --git a/src/tests/dejagnu/pkinit-certs/user.p12 b/src/tests/pkinit-certs/user.p12 similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user.p12 rename to src/tests/pkinit-certs/user.p12 diff --git a/src/tests/dejagnu/pkinit-certs/user.pem b/src/tests/pkinit-certs/user.pem similarity index 100% rename from src/tests/dejagnu/pkinit-certs/user.pem rename to src/tests/pkinit-certs/user.pem diff --git a/src/tests/dejagnu/proxy-certs/ca.pem b/src/tests/proxy-certs/ca.pem similarity index 100% rename from src/tests/dejagnu/proxy-certs/ca.pem rename to src/tests/proxy-certs/ca.pem diff --git a/src/tests/dejagnu/proxy-certs/make-certs.sh b/src/tests/proxy-certs/make-certs.sh similarity index 100% rename from src/tests/dejagnu/proxy-certs/make-certs.sh rename to src/tests/proxy-certs/make-certs.sh diff --git a/src/tests/dejagnu/proxy-certs/proxy-badsig.pem b/src/tests/proxy-certs/proxy-badsig.pem similarity index 100% rename from src/tests/dejagnu/proxy-certs/proxy-badsig.pem rename to src/tests/proxy-certs/proxy-badsig.pem diff --git a/src/tests/dejagnu/proxy-certs/proxy-ideal.pem b/src/tests/proxy-certs/proxy-ideal.pem similarity index 100% rename from src/tests/dejagnu/proxy-certs/proxy-ideal.pem rename to src/tests/proxy-certs/proxy-ideal.pem diff --git a/src/tests/dejagnu/proxy-certs/proxy-no-match.pem b/src/tests/proxy-certs/proxy-no-match.pem similarity index 100% rename from src/tests/dejagnu/proxy-certs/proxy-no-match.pem rename to src/tests/proxy-certs/proxy-no-match.pem diff --git a/src/tests/dejagnu/proxy-certs/proxy-san.pem b/src/tests/proxy-certs/proxy-san.pem similarity index 100% rename from src/tests/dejagnu/proxy-certs/proxy-san.pem rename to src/tests/proxy-certs/proxy-san.pem diff --git a/src/tests/dejagnu/proxy-certs/proxy-subject.pem b/src/tests/proxy-certs/proxy-subject.pem similarity index 100% rename from src/tests/dejagnu/proxy-certs/proxy-subject.pem rename to src/tests/proxy-certs/proxy-subject.pem diff --git a/src/tests/t_authdata.py b/src/tests/t_authdata.py index 3fa957a..a1d7c7e 100644 --- a/src/tests/t_authdata.py +++ b/src/tests/t_authdata.py @@ -57,7 +57,7 @@ if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')): skipped('anonymous ticket authdata tests', 'PKINIT not built') else: # Set up a realm with PKINIT support and get anonymous tickets. - certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs') + certs = os.path.join(srctop, 'tests', 'pkinit-certs') ca_pem = os.path.join(certs, 'ca.pem') kdc_pem = os.path.join(certs, 'kdc.pem') privkey_pem = os.path.join(certs, 'privkey.pem') diff --git a/src/tests/t_certauth.py b/src/tests/t_certauth.py index 0fe0fdb..c235e99 100644 --- a/src/tests/t_certauth.py +++ b/src/tests/t_certauth.py @@ -4,7 +4,7 @@ from k5test import * if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')): skip_rest('certauth tests', 'PKINIT module not built') -certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs') +certs = os.path.join(srctop, 'tests', 'pkinit-certs') ca_pem = os.path.join(certs, 'ca.pem') kdc_pem = os.path.join(certs, 'kdc.pem') privkey_pem = os.path.join(certs, 'privkey.pem') diff --git a/src/tests/dejagnu/t_inetd.c b/src/tests/t_inetd.c similarity index 99% rename from src/tests/dejagnu/t_inetd.c rename to src/tests/t_inetd.c index 9164bbb..e23c6b9 100644 --- a/src/tests/dejagnu/t_inetd.c +++ b/src/tests/t_inetd.c @@ -1,5 +1,5 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* tests/dejagnu/t_inetd.c */ +/* tests/t_inetd.c */ /* * Copyright 1991 by the Massachusetts Institute of Technology. * All Rights Reserved. diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py index aee4da2..3d90e76 100755 --- a/src/tests/t_pkinit.py +++ b/src/tests/t_pkinit.py @@ -7,7 +7,7 @@ if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')): soft_pkcs11 = os.path.join(buildtop, 'tests', 'softpkcs11', 'softpkcs11.so') # Construct a krb5.conf fragment configuring pkinit. -certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs') +certs = os.path.join(srctop, 'tests', 'pkinit-certs') ca_pem = os.path.join(certs, 'ca.pem') kdc_pem = os.path.join(certs, 'kdc.pem') user_pem = os.path.join(certs, 'user.pem') diff --git a/src/tests/t_proxy.py b/src/tests/t_proxy.py index 3069eaa..cbd592a 100755 --- a/src/tests/t_proxy.py +++ b/src/tests/t_proxy.py @@ -10,17 +10,13 @@ except: # Construct a krb5.conf fragment configuring the client to use a local proxy # server. -proxysubjectpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', - 'proxy-subject.pem') -proxysanpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', - 'proxy-san.pem') -proxyidealpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', - 'proxy-ideal.pem') -proxywrongpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', - 'proxy-no-match.pem') -proxybadpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', - 'proxy-badsig.pem') -proxyca = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', 'ca.pem') +proxycerts = os.path.join(srctop, 'tests', 'proxy-certs') +proxysubjectpem = os.path.join(proxycerts, 'proxy-subject.pem') +proxysanpem = os.path.join(proxycerts, 'proxy-san.pem') +proxyidealpem = os.path.join(proxycerts, 'proxy-ideal.pem') +proxywrongpem = os.path.join(proxycerts, 'proxy-no-match.pem') +proxybadpem = os.path.join(proxycerts, 'proxy-badsig.pem') +proxyca = os.path.join(proxycerts, 'ca.pem') proxyurl = 'https://localhost:$port5/KdcProxy' proxyurlupcase = 'https://LocalHost:$port5/KdcProxy' proxyurl4 = 'https://127.0.0.1:$port5/KdcProxy' diff --git a/src/util/k5test.py b/src/util/k5test.py index e41bf36..9a9151b 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -1397,7 +1397,7 @@ kswitch = os.path.join(buildtop, 'clients', 'kswitch', 'kswitch') kvno = os.path.join(buildtop, 'clients', 'kvno', 'kvno') kdestroy = os.path.join(buildtop, 'clients', 'kdestroy', 'kdestroy') kpasswd = os.path.join(buildtop, 'clients', 'kpasswd', 'kpasswd') -t_inetd = os.path.join(buildtop, 'tests', 'dejagnu', 't_inetd') +t_inetd = os.path.join(buildtop, 'tests', 't_inetd') kproplog = os.path.join(buildtop, 'kprop', 'kproplog') kpropd = os.path.join(buildtop, 'kprop', 'kpropd') kprop = os.path.join(buildtop, 'kprop', 'kprop')