|
 |
8874ae |
From 20cbbd0b273af56c6d527c8e6b9d96eef49926f2 Mon Sep 17 00:00:00 2001
|
|
|
8874ae |
From: Julien Rische <jrische@redhat.com>
|
|
|
8874ae |
Date: Thu, 31 Mar 2022 18:24:39 +0200
|
|
|
8874ae |
Subject: [PATCH] Use newly enforced dejagnu path naming convention
|
|
|
8874ae |
|
|
|
8874ae |
Since version 1.6.3, dejagnu started to enforce a naming convention that
|
|
|
8874ae |
was already in place, but not mandatory: dejagnu test directories have
|
|
|
8874ae |
to be named "testsuite". If they don't implicit relative sub-paths
|
|
|
8874ae |
resolution (e.g. "lib", "config") is not forking.
|
|
|
8874ae |
|
|
|
8874ae |
This commit renames kadm5 library's unit tests and global tests
|
|
|
8874ae |
directories to match this requirement.
|
|
|
8874ae |
|
|
|
8874ae |
Resolves: rhbz#2053133
|
|
|
8874ae |
|
|
|
8874ae |
Signed-off-by: Julien Rische <jrische@redhat.com>
|
|
|
8874ae |
---
|
|
|
8874ae |
src/configure.ac | 4 +--
|
|
|
8874ae |
src/lib/kadm5/Makefile.in | 2 +-
|
|
|
8874ae |
.../{unit-test => testsuite}/Makefile.in | 28 +++++++++---------
|
|
|
8874ae |
.../api.2/crte-policy.exp | 0
|
|
|
8874ae |
.../api.2/get-policy.exp | 0
|
|
|
8874ae |
.../api.2/mod-policy.exp | 0
|
|
|
8874ae |
.../api.current/chpass-principal-v2.exp | 0
|
|
|
8874ae |
.../api.current/chpass-principal.exp | 0
|
|
|
8874ae |
.../api.current/crte-policy.exp | 0
|
|
|
8874ae |
.../api.current/crte-principal.exp | 0
|
|
|
8874ae |
.../api.current/destroy.exp | 0
|
|
|
8874ae |
.../api.current/dlte-policy.exp | 0
|
|
|
8874ae |
.../api.current/dlte-principal.exp | 0
|
|
|
8874ae |
.../api.current/get-policy.exp | 0
|
|
|
8874ae |
.../api.current/get-principal-v2.exp | 0
|
|
|
8874ae |
.../api.current/get-principal.exp | 0
|
|
|
8874ae |
.../api.current/init-v2.exp | 0
|
|
|
8874ae |
.../api.current/init.exp | 0
|
|
|
8874ae |
.../api.current/mod-policy.exp | 0
|
|
|
8874ae |
.../api.current/mod-principal-v2.exp | 0
|
|
|
8874ae |
.../api.current/mod-principal.exp | 0
|
|
|
8874ae |
.../api.current/randkey-principal-v2.exp | 0
|
|
|
8874ae |
.../api.current/randkey-principal.exp | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/config/unix.exp | 0
|
|
|
8874ae |
src/lib/kadm5/{unit-test => testsuite}/deps | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/destroy-test.c | 0
|
|
|
8874ae |
.../diff-files/destroy-1 | 0
|
|
|
8874ae |
.../diff-files/no-diffs | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/handle-test.c | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/init-test.c | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/iter-test.c | 0
|
|
|
8874ae |
.../kadm5/{unit-test => testsuite}/lib/lib.t | 2 +-
|
|
|
8874ae |
.../{unit-test => testsuite}/lock-test.c | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/randkey-test.c | 0
|
|
|
8874ae |
.../{unit-test => testsuite}/setkey-test.c | 0
|
|
|
8874ae |
.../kadm5/{unit-test => testsuite}/site.exp | 0
|
|
|
8874ae |
src/tests/Makefile.in | 2 +-
|
|
|
8874ae |
src/tests/t_authdata.py | 2 +-
|
|
|
8874ae |
src/tests/t_certauth.py | 2 +-
|
|
|
8874ae |
src/tests/t_pkinit.py | 2 +-
|
|
|
8874ae |
src/tests/t_proxy.py | 12 ++++----
|
|
|
8874ae |
src/tests/{dejagnu => testsuite}/Makefile.in | 4 +--
|
|
|
8874ae |
.../{dejagnu => testsuite}/config/default.exp | 2 +-
|
|
|
8874ae |
src/tests/{dejagnu => testsuite}/deps | 0
|
|
|
8874ae |
.../krb-standalone/gssapi.exp | 2 +-
|
|
|
8874ae |
.../krb-standalone/kprop.exp | 0
|
|
|
8874ae |
.../krb-standalone/princexpire.exp | 0
|
|
|
8874ae |
.../krb-standalone/sample.exp | 2 +-
|
|
|
8874ae |
.../krb-standalone/simple.exp | 2 +-
|
|
|
8874ae |
.../krb-standalone/standalone.exp | 0
|
|
|
8874ae |
.../krb-standalone/tcp.exp | 0
|
|
|
8874ae |
.../pkinit-certs/ca.pem | 0
|
|
|
8874ae |
.../pkinit-certs/generic.p12 | Bin
|
|
|
8874ae |
.../pkinit-certs/generic.pem | 0
|
|
|
8874ae |
.../pkinit-certs/kdc.pem | 0
|
|
|
8874ae |
.../pkinit-certs/make-certs.sh | 0
|
|
|
8874ae |
.../pkinit-certs/privkey-enc.pem | 0
|
|
|
8874ae |
.../pkinit-certs/privkey.pem | 0
|
|
|
8874ae |
.../pkinit-certs/user-enc.p12 | Bin
|
|
|
8874ae |
.../pkinit-certs/user-upn.p12 | Bin
|
|
|
8874ae |
.../pkinit-certs/user-upn.pem | 0
|
|
|
8874ae |
.../pkinit-certs/user-upn2.p12 | Bin
|
|
|
8874ae |
.../pkinit-certs/user-upn2.pem | 0
|
|
|
8874ae |
.../pkinit-certs/user-upn3.p12 | Bin
|
|
|
8874ae |
.../pkinit-certs/user-upn3.pem | 0
|
|
|
8874ae |
.../pkinit-certs/user.p12 | Bin
|
|
|
8874ae |
.../pkinit-certs/user.pem | 0
|
|
|
8874ae |
.../{dejagnu => testsuite}/proxy-certs/ca.pem | 0
|
|
|
8874ae |
.../proxy-certs/make-certs.sh | 0
|
|
|
8874ae |
.../proxy-certs/proxy-badsig.pem | 0
|
|
|
8874ae |
.../proxy-certs/proxy-ideal.pem | 0
|
|
|
8874ae |
.../proxy-certs/proxy-no-match.pem | 0
|
|
|
8874ae |
.../proxy-certs/proxy-san.pem | 0
|
|
|
8874ae |
.../proxy-certs/proxy-subject.pem | 0
|
|
|
8874ae |
src/tests/{dejagnu => testsuite}/t_inetd.c | 2 +-
|
|
|
8874ae |
src/util/k5test.py | 2 +-
|
|
|
8874ae |
76 files changed, 36 insertions(+), 36 deletions(-)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/Makefile.in (86%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.2/crte-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.2/get-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.2/mod-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/chpass-principal-v2.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/chpass-principal.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/crte-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/crte-principal.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/destroy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/dlte-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/dlte-principal.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/get-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/get-principal-v2.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/get-principal.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/init-v2.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/init.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/mod-policy.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/mod-principal-v2.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/mod-principal.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/randkey-principal-v2.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/api.current/randkey-principal.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/config/unix.exp (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/deps (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/destroy-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/diff-files/destroy-1 (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/diff-files/no-diffs (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/handle-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/init-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/iter-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/lib/lib.t (99%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/lock-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/randkey-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/setkey-test.c (100%)
|
|
|
8874ae |
rename src/lib/kadm5/{unit-test => testsuite}/site.exp (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/Makefile.in (92%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/config/default.exp (99%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/deps (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/gssapi.exp (98%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/kprop.exp (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/princexpire.exp (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/sample.exp (98%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/simple.exp (98%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/standalone.exp (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/krb-standalone/tcp.exp (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/ca.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/generic.p12 (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/generic.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/kdc.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/make-certs.sh (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/privkey-enc.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/privkey.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-enc.p12 (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-upn.p12 (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-upn.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-upn2.p12 (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-upn2.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-upn3.p12 (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user-upn3.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user.p12 (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/pkinit-certs/user.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/ca.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/make-certs.sh (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/proxy-badsig.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/proxy-ideal.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/proxy-no-match.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/proxy-san.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/proxy-certs/proxy-subject.pem (100%)
|
|
|
8874ae |
rename src/tests/{dejagnu => testsuite}/t_inetd.c (99%)
|
|
|
8874ae |
|
|
|
8874ae |
diff --git a/src/configure.ac b/src/configure.ac
|
|
|
8874ae |
index 20066918b..363d5d62d 100644
|
|
|
8874ae |
--- a/src/configure.ac
|
|
|
8874ae |
+++ b/src/configure.ac
|
|
|
8874ae |
@@ -1500,7 +1500,7 @@ V5_AC_OUTPUT_MAKEFILE(.
|
|
|
8874ae |
|
|
|
8874ae |
lib/rpc lib/rpc/unit-test
|
|
|
8874ae |
|
|
|
8874ae |
- lib/kadm5 lib/kadm5/clnt lib/kadm5/srv lib/kadm5/unit-test
|
|
|
8874ae |
+ lib/kadm5 lib/kadm5/clnt lib/kadm5/srv lib/kadm5/testsuite
|
|
|
8874ae |
lib/krad
|
|
|
8874ae |
lib/apputils
|
|
|
8874ae |
|
|
|
8874ae |
@@ -1544,5 +1544,5 @@ V5_AC_OUTPUT_MAKEFILE(.
|
|
|
8874ae |
appl/gss-sample appl/user_user
|
|
|
8874ae |
|
|
|
8874ae |
tests tests/asn.1 tests/create tests/hammer tests/verify tests/gssapi
|
|
|
8874ae |
- tests/dejagnu tests/threads tests/shlib tests/gss-threads tests/misc
|
|
|
8874ae |
+ tests/testsuite tests/threads tests/shlib tests/gss-threads tests/misc
|
|
|
8874ae |
)
|
|
|
8874ae |
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
|
|
|
8874ae |
index c4eaad38d..76fc4b548 100644
|
|
|
8874ae |
--- a/src/lib/kadm5/Makefile.in
|
|
|
8874ae |
+++ b/src/lib/kadm5/Makefile.in
|
|
|
8874ae |
@@ -1,6 +1,6 @@
|
|
|
8874ae |
mydir=lib$(S)kadm5
|
|
|
8874ae |
BUILDTOP=$(REL)..$(S)..
|
|
|
8874ae |
-SUBDIRS = clnt srv unit-test
|
|
|
8874ae |
+SUBDIRS = clnt srv testsuite
|
|
|
8874ae |
|
|
|
8874ae |
##DOSBUILDTOP = ..\..
|
|
|
8874ae |
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/testsuite/Makefile.in
|
|
|
8874ae |
similarity index 86%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/Makefile.in
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/Makefile.in
|
|
|
8874ae |
index 68fa097ff..5a55b786b 100644
|
|
|
8874ae |
--- a/src/lib/kadm5/unit-test/Makefile.in
|
|
|
8874ae |
+++ b/src/lib/kadm5/testsuite/Makefile.in
|
|
|
8874ae |
@@ -1,4 +1,4 @@
|
|
|
8874ae |
-mydir=lib$(S)kadm5$(S)unit-test
|
|
|
8874ae |
+mydir=lib$(S)kadm5$(S)testsuite
|
|
|
8874ae |
BUILDTOP=$(REL)..$(S)..$(S)..
|
|
|
8874ae |
KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
|
|
|
8874ae |
|
|
|
8874ae |
@@ -61,7 +61,7 @@ runenv.exp: Makefile
|
|
|
8874ae |
eval echo "set env\($$i\) \$$$$i"; done > runenv.exp
|
|
|
8874ae |
|
|
|
8874ae |
#
|
|
|
8874ae |
-# The unit-test targets
|
|
|
8874ae |
+# The testsuite targets
|
|
|
8874ae |
#
|
|
|
8874ae |
|
|
|
8874ae |
check: check-@DO_TEST@
|
|
|
8874ae |
@@ -72,13 +72,13 @@ check-:
|
|
|
8874ae |
@echo "+++ Either tcl, runtest, or Perl is unavailable."
|
|
|
8874ae |
@echo "+++"
|
|
|
8874ae |
|
|
|
8874ae |
-check-ok unit-test: unit-test-client unit-test-server
|
|
|
8874ae |
+check-ok testsuite: testsuite-client testsuite-server
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-client: unit-test-client-setup unit-test-client-body \
|
|
|
8874ae |
- unit-test-client-cleanup
|
|
|
8874ae |
+testsuite-client: testsuite-client-setup testsuite-client-body \
|
|
|
8874ae |
+ testsuite-client-cleanup
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-server: unit-test-server-setup unit-test-server-body \
|
|
|
8874ae |
- unit-test-server-cleanup
|
|
|
8874ae |
+testsuite-server: testsuite-server-setup testsuite-server-body \
|
|
|
8874ae |
+ testsuite-server-cleanup
|
|
|
8874ae |
|
|
|
8874ae |
test-randkey: randkey-test
|
|
|
8874ae |
$(ENV_SETUP) $(VALGRIND) ./randkey-test
|
|
|
8874ae |
@@ -98,19 +98,19 @@ test-destroy: destroy-test
|
|
|
8874ae |
test-setkey-client: client-setkey-test
|
|
|
8874ae |
$(ENV_SETUP) $(VALGRIND) ./client-setkey-test testkeys admin admin
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-client-setup: runenv.sh
|
|
|
8874ae |
+testsuite-client-setup: runenv.sh
|
|
|
8874ae |
$(ENV_SETUP) $(VALGRIND) $(START_SERVERS)
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-client-cleanup:
|
|
|
8874ae |
+testsuite-client-cleanup:
|
|
|
8874ae |
$(ENV_SETUP) $(STOP_SERVERS)
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-server-setup: runenv.sh
|
|
|
8874ae |
+testsuite-server-setup: runenv.sh
|
|
|
8874ae |
$(ENV_SETUP) $(VALGRIND) $(START_SERVERS_LOCAL)
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-server-cleanup:
|
|
|
8874ae |
+testsuite-server-cleanup:
|
|
|
8874ae |
$(ENV_SETUP) $(STOP_SERVERS_LOCAL)
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-client-body: site.exp test-noauth test-destroy test-handle-client \
|
|
|
8874ae |
+testsuite-client-body: site.exp test-noauth test-destroy test-handle-client \
|
|
|
8874ae |
test-setkey-client runenv.exp
|
|
|
8874ae |
$(ENV_SETUP) $(RUNTEST) --tool api RPC=1 API=$(CLNTTCL) \
|
|
|
8874ae |
KINIT=$(BUILDTOP)/clients/kinit/kinit \
|
|
|
8874ae |
@@ -121,7 +121,7 @@ unit-test-client-body: site.exp test-noauth test-destroy test-handle-client \
|
|
|
8874ae |
-mv api.log capi.log
|
|
|
8874ae |
-mv api.sum capi.sum
|
|
|
8874ae |
|
|
|
8874ae |
-unit-test-server-body: site.exp test-handle-server lock-test
|
|
|
8874ae |
+testsuite-server-body: site.exp test-handle-server lock-test
|
|
|
8874ae |
$(ENV_SETUP) $(RUNTEST) --tool api RPC=0 API=$(SRVTCL) \
|
|
|
8874ae |
LOCKTEST=./lock-test \
|
|
|
8874ae |
KADMIN_LOCAL=$(BUILDTOP)/kadmin/cli/kadmin.local \
|
|
|
8874ae |
@@ -140,4 +140,4 @@ clean:
|
|
|
8874ae |
$(RM) lock-test lock-test.o
|
|
|
8874ae |
$(RM) server-iter-test iter-test.o
|
|
|
8874ae |
$(RM) server-setkey-test client-setkey-test setkey-test.o
|
|
|
8874ae |
- $(RM) *.log *.plog *.sum *.psum unit-test-log.* runenv.exp
|
|
|
8874ae |
+ $(RM) *.log *.plog *.sum *.psum testsuite-log.* runenv.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.2/crte-policy.exp b/src/lib/kadm5/testsuite/api.2/crte-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.2/crte-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.2/crte-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.2/get-policy.exp b/src/lib/kadm5/testsuite/api.2/get-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.2/get-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.2/get-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.2/mod-policy.exp b/src/lib/kadm5/testsuite/api.2/mod-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.2/mod-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.2/mod-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp b/src/lib/kadm5/testsuite/api.current/chpass-principal-v2.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/chpass-principal-v2.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/chpass-principal-v2.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/chpass-principal.exp b/src/lib/kadm5/testsuite/api.current/chpass-principal.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/chpass-principal.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/chpass-principal.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/crte-policy.exp b/src/lib/kadm5/testsuite/api.current/crte-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/crte-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/crte-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/crte-principal.exp b/src/lib/kadm5/testsuite/api.current/crte-principal.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/crte-principal.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/crte-principal.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/destroy.exp b/src/lib/kadm5/testsuite/api.current/destroy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/destroy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/destroy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/dlte-policy.exp b/src/lib/kadm5/testsuite/api.current/dlte-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/dlte-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/dlte-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/dlte-principal.exp b/src/lib/kadm5/testsuite/api.current/dlte-principal.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/dlte-principal.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/dlte-principal.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/get-policy.exp b/src/lib/kadm5/testsuite/api.current/get-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/get-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/get-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/get-principal-v2.exp b/src/lib/kadm5/testsuite/api.current/get-principal-v2.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/get-principal-v2.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/get-principal-v2.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/get-principal.exp b/src/lib/kadm5/testsuite/api.current/get-principal.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/get-principal.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/get-principal.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/init-v2.exp b/src/lib/kadm5/testsuite/api.current/init-v2.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/init-v2.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/init-v2.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/init.exp b/src/lib/kadm5/testsuite/api.current/init.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/init.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/init.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/mod-policy.exp b/src/lib/kadm5/testsuite/api.current/mod-policy.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/mod-policy.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/mod-policy.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/mod-principal-v2.exp b/src/lib/kadm5/testsuite/api.current/mod-principal-v2.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/mod-principal-v2.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/mod-principal-v2.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/mod-principal.exp b/src/lib/kadm5/testsuite/api.current/mod-principal.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/mod-principal.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/mod-principal.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp b/src/lib/kadm5/testsuite/api.current/randkey-principal-v2.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/randkey-principal-v2.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/randkey-principal-v2.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/api.current/randkey-principal.exp b/src/lib/kadm5/testsuite/api.current/randkey-principal.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/api.current/randkey-principal.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/api.current/randkey-principal.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/config/unix.exp b/src/lib/kadm5/testsuite/config/unix.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/config/unix.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/config/unix.exp
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/deps b/src/lib/kadm5/testsuite/deps
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/deps
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/deps
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/destroy-test.c b/src/lib/kadm5/testsuite/destroy-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/destroy-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/destroy-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/diff-files/destroy-1 b/src/lib/kadm5/testsuite/diff-files/destroy-1
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/diff-files/destroy-1
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/diff-files/destroy-1
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/diff-files/no-diffs b/src/lib/kadm5/testsuite/diff-files/no-diffs
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/diff-files/no-diffs
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/diff-files/no-diffs
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/handle-test.c b/src/lib/kadm5/testsuite/handle-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/handle-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/handle-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/init-test.c b/src/lib/kadm5/testsuite/init-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/init-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/init-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/iter-test.c b/src/lib/kadm5/testsuite/iter-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/iter-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/iter-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/lib/lib.t b/src/lib/kadm5/testsuite/lib/lib.t
|
|
|
8874ae |
similarity index 99%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/lib/lib.t
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/lib/lib.t
|
|
|
8874ae |
index 3444775cf..327946849 100644
|
|
|
8874ae |
--- a/src/lib/kadm5/unit-test/lib/lib.t
|
|
|
8874ae |
+++ b/src/lib/kadm5/testsuite/lib/lib.t
|
|
|
8874ae |
@@ -226,7 +226,7 @@ proc end_dump_compare {name} {
|
|
|
8874ae |
global RPC
|
|
|
8874ae |
|
|
|
8874ae |
if { ! $RPC } {
|
|
|
8874ae |
-# set file $TOP/admin/lib/unit-test/diff-files/$name
|
|
|
8874ae |
+# set file $TOP/admin/lib/testsuite/diff-files/$name
|
|
|
8874ae |
# exec $env(SIMPLE_DUMP) > /tmp/dump.after
|
|
|
8874ae |
# exec $env(COMPARE_DUMP) /tmp/dump.before /tmp/dump.after $file
|
|
|
8874ae |
}
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/lock-test.c b/src/lib/kadm5/testsuite/lock-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/lock-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/lock-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/randkey-test.c b/src/lib/kadm5/testsuite/randkey-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/randkey-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/randkey-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/testsuite/setkey-test.c
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/setkey-test.c
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/setkey-test.c
|
|
|
8874ae |
diff --git a/src/lib/kadm5/unit-test/site.exp b/src/lib/kadm5/testsuite/site.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/lib/kadm5/unit-test/site.exp
|
|
|
8874ae |
rename to src/lib/kadm5/testsuite/site.exp
|
|
|
8874ae |
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
|
|
|
8874ae |
index 20f27d748..1198dca0c 100644
|
|
|
8874ae |
--- a/src/tests/Makefile.in
|
|
|
8874ae |
+++ b/src/tests/Makefile.in
|
|
|
8874ae |
@@ -1,6 +1,6 @@
|
|
|
8874ae |
mydir=tests
|
|
|
8874ae |
BUILDTOP=$(REL)..
|
|
|
8874ae |
-SUBDIRS = asn.1 create hammer verify gssapi dejagnu shlib gss-threads misc \
|
|
|
8874ae |
+SUBDIRS = asn.1 create hammer verify gssapi testsuite shlib gss-threads misc \
|
|
|
8874ae |
threads softpkcs11
|
|
|
8874ae |
|
|
|
8874ae |
RUN_DB_TEST = $(RUN_SETUP) KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf \
|
|
|
8874ae |
diff --git a/src/tests/t_authdata.py b/src/tests/t_authdata.py
|
|
|
8874ae |
index 2e01f46bc..e5135f435 100644
|
|
|
8874ae |
--- a/src/tests/t_authdata.py
|
|
|
8874ae |
+++ b/src/tests/t_authdata.py
|
|
|
8874ae |
@@ -57,7 +57,7 @@ if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
|
|
|
8874ae |
skipped('anonymous ticket authdata tests', 'PKINIT not built')
|
|
|
8874ae |
else:
|
|
|
8874ae |
# Set up a realm with PKINIT support and get anonymous tickets.
|
|
|
8874ae |
- certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs')
|
|
|
8874ae |
+ certs = os.path.join(srctop, 'tests', 'testsuite', 'pkinit-certs')
|
|
|
8874ae |
ca_pem = os.path.join(certs, 'ca.pem')
|
|
|
8874ae |
kdc_pem = os.path.join(certs, 'kdc.pem')
|
|
|
8874ae |
privkey_pem = os.path.join(certs, 'privkey.pem')
|
|
|
8874ae |
diff --git a/src/tests/t_certauth.py b/src/tests/t_certauth.py
|
|
|
8874ae |
index 0fe0fdb4a..bfa5bfc96 100644
|
|
|
8874ae |
--- a/src/tests/t_certauth.py
|
|
|
8874ae |
+++ b/src/tests/t_certauth.py
|
|
|
8874ae |
@@ -4,7 +4,7 @@ from k5test import *
|
|
|
8874ae |
if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
|
|
|
8874ae |
skip_rest('certauth tests', 'PKINIT module not built')
|
|
|
8874ae |
|
|
|
8874ae |
-certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs')
|
|
|
8874ae |
+certs = os.path.join(srctop, 'tests', 'testsuite', 'pkinit-certs')
|
|
|
8874ae |
ca_pem = os.path.join(certs, 'ca.pem')
|
|
|
8874ae |
kdc_pem = os.path.join(certs, 'kdc.pem')
|
|
|
8874ae |
privkey_pem = os.path.join(certs, 'privkey.pem')
|
|
|
8874ae |
diff --git a/src/tests/t_pkinit.py b/src/tests/t_pkinit.py
|
|
|
8874ae |
index aee4da2b1..8763ce484 100755
|
|
|
8874ae |
--- a/src/tests/t_pkinit.py
|
|
|
8874ae |
+++ b/src/tests/t_pkinit.py
|
|
|
8874ae |
@@ -7,7 +7,7 @@ if not os.path.exists(os.path.join(plugins, 'preauth', 'pkinit.so')):
|
|
|
8874ae |
soft_pkcs11 = os.path.join(buildtop, 'tests', 'softpkcs11', 'softpkcs11.so')
|
|
|
8874ae |
|
|
|
8874ae |
# Construct a krb5.conf fragment configuring pkinit.
|
|
|
8874ae |
-certs = os.path.join(srctop, 'tests', 'dejagnu', 'pkinit-certs')
|
|
|
8874ae |
+certs = os.path.join(srctop, 'tests', 'testsuite', 'pkinit-certs')
|
|
|
8874ae |
ca_pem = os.path.join(certs, 'ca.pem')
|
|
|
8874ae |
kdc_pem = os.path.join(certs, 'kdc.pem')
|
|
|
8874ae |
user_pem = os.path.join(certs, 'user.pem')
|
|
|
8874ae |
diff --git a/src/tests/t_proxy.py b/src/tests/t_proxy.py
|
|
|
8874ae |
index 3069eaa8f..6ae5c8c8e 100755
|
|
|
8874ae |
--- a/src/tests/t_proxy.py
|
|
|
8874ae |
+++ b/src/tests/t_proxy.py
|
|
|
8874ae |
@@ -10,17 +10,17 @@ except:
|
|
|
8874ae |
|
|
|
8874ae |
# Construct a krb5.conf fragment configuring the client to use a local proxy
|
|
|
8874ae |
# server.
|
|
|
8874ae |
-proxysubjectpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
|
|
|
8874ae |
+proxysubjectpem = os.path.join(srctop, 'tests', 'testsuite', 'proxy-certs',
|
|
|
8874ae |
'proxy-subject.pem')
|
|
|
8874ae |
-proxysanpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
|
|
|
8874ae |
+proxysanpem = os.path.join(srctop, 'tests', 'testsuite', 'proxy-certs',
|
|
|
8874ae |
'proxy-san.pem')
|
|
|
8874ae |
-proxyidealpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
|
|
|
8874ae |
+proxyidealpem = os.path.join(srctop, 'tests', 'testsuite', 'proxy-certs',
|
|
|
8874ae |
'proxy-ideal.pem')
|
|
|
8874ae |
-proxywrongpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
|
|
|
8874ae |
+proxywrongpem = os.path.join(srctop, 'tests', 'testsuite', 'proxy-certs',
|
|
|
8874ae |
'proxy-no-match.pem')
|
|
|
8874ae |
-proxybadpem = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs',
|
|
|
8874ae |
+proxybadpem = os.path.join(srctop, 'tests', 'testsuite', 'proxy-certs',
|
|
|
8874ae |
'proxy-badsig.pem')
|
|
|
8874ae |
-proxyca = os.path.join(srctop, 'tests', 'dejagnu', 'proxy-certs', 'ca.pem')
|
|
|
8874ae |
+proxyca = os.path.join(srctop, 'tests', 'testsuite', 'proxy-certs', 'ca.pem')
|
|
|
8874ae |
proxyurl = 'https://localhost:$port5/KdcProxy'
|
|
|
8874ae |
proxyurlupcase = 'https://LocalHost:$port5/KdcProxy'
|
|
|
8874ae |
proxyurl4 = 'https://127.0.0.1:$port5/KdcProxy'
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/testsuite/Makefile.in
|
|
|
8874ae |
similarity index 92%
|
|
|
8874ae |
rename from src/tests/dejagnu/Makefile.in
|
|
|
8874ae |
rename to src/tests/testsuite/Makefile.in
|
|
|
8874ae |
index e78e270ed..d3efe3606 100644
|
|
|
8874ae |
--- a/src/tests/dejagnu/Makefile.in
|
|
|
8874ae |
+++ b/src/tests/testsuite/Makefile.in
|
|
|
8874ae |
@@ -1,4 +1,4 @@
|
|
|
8874ae |
-mydir=tests$(S)dejagnu
|
|
|
8874ae |
+mydir=tests$(S)testsuite
|
|
|
8874ae |
BUILDTOP=$(REL)..$(S)..
|
|
|
8874ae |
RUNTEST = @RUNTEST@ $(DEJAFLAGS)
|
|
|
8874ae |
RUNTESTFLAGS =
|
|
|
8874ae |
@@ -13,7 +13,7 @@ check: check-runtest-@HAVE_RUNTEST@
|
|
|
8874ae |
|
|
|
8874ae |
check-runtest-no:
|
|
|
8874ae |
@echo "+++"
|
|
|
8874ae |
- @echo "+++ WARNING: tests/dejagnu tests not run."
|
|
|
8874ae |
+ @echo "+++ WARNING: tests/testsuite tests not run."
|
|
|
8874ae |
@echo "+++ runtest is unavailable."
|
|
|
8874ae |
@echo "+++"
|
|
|
8874ae |
@echo 'Skipped dejagnu tests: runtest not found' >> $(SKIPTESTS)
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/testsuite/config/default.exp
|
|
|
8874ae |
similarity index 99%
|
|
|
8874ae |
rename from src/tests/dejagnu/config/default.exp
|
|
|
8874ae |
rename to src/tests/testsuite/config/default.exp
|
|
|
8874ae |
index 302dee74c..1492fac32 100644
|
|
|
8874ae |
--- a/src/tests/dejagnu/config/default.exp
|
|
|
8874ae |
+++ b/src/tests/testsuite/config/default.exp
|
|
|
8874ae |
@@ -256,7 +256,7 @@ verbose "Test realm is $REALMNAME"
|
|
|
8874ae |
|
|
|
8874ae |
# Find some programs we need. We use the binaries from the build tree
|
|
|
8874ae |
# if they exist. If they do not, then they must be in PATH. We
|
|
|
8874ae |
-# expect $objdir to be ...tests/dejagnu.
|
|
|
8874ae |
+# expect $objdir to be ...tests/testsuite.
|
|
|
8874ae |
|
|
|
8874ae |
foreach i {
|
|
|
8874ae |
{KDB5_UTIL $objdir/../../kadmin/dbutil/kdb5_util}
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/deps b/src/tests/testsuite/deps
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/deps
|
|
|
8874ae |
rename to src/tests/testsuite/deps
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/gssapi.exp b/src/tests/testsuite/krb-standalone/gssapi.exp
|
|
|
8874ae |
similarity index 98%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/gssapi.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/gssapi.exp
|
|
|
8874ae |
index e3357e769..d176e210c 100644
|
|
|
8874ae |
--- a/src/tests/dejagnu/krb-standalone/gssapi.exp
|
|
|
8874ae |
+++ b/src/tests/testsuite/krb-standalone/gssapi.exp
|
|
|
8874ae |
@@ -2,7 +2,7 @@
|
|
|
8874ae |
# This is a DejaGnu test script.
|
|
|
8874ae |
# This script tests that the GSS-API tester functions correctly.
|
|
|
8874ae |
|
|
|
8874ae |
-# This mostly just calls procedures in test/dejagnu/config/default.exp.
|
|
|
8874ae |
+# This mostly just calls procedures in test/testsuite/config/default.exp.
|
|
|
8874ae |
|
|
|
8874ae |
if ![info exists KDESTROY] {
|
|
|
8874ae |
set KDESTROY [findfile $objdir/../../clients/kdestroy/kdestroy]
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/kprop.exp b/src/tests/testsuite/krb-standalone/kprop.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/kprop.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/kprop.exp
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/princexpire.exp b/src/tests/testsuite/krb-standalone/princexpire.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/princexpire.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/princexpire.exp
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/sample.exp b/src/tests/testsuite/krb-standalone/sample.exp
|
|
|
8874ae |
similarity index 98%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/sample.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/sample.exp
|
|
|
8874ae |
index 93a75f1d0..009de5ddb 100644
|
|
|
8874ae |
--- a/src/tests/dejagnu/krb-standalone/sample.exp
|
|
|
8874ae |
+++ b/src/tests/testsuite/krb-standalone/sample.exp
|
|
|
8874ae |
@@ -2,7 +2,7 @@
|
|
|
8874ae |
# This is a DejaGnu test script.
|
|
|
8874ae |
# This script tests that sample user-user communication works.
|
|
|
8874ae |
|
|
|
8874ae |
-# This mostly just calls procedures in test/dejagnu/config/default.exp.
|
|
|
8874ae |
+# This mostly just calls procedures in test/testsuite/config/default.exp.
|
|
|
8874ae |
|
|
|
8874ae |
if ![info exists KLIST] {
|
|
|
8874ae |
set KLIST [findfile $objdir/../../clients/klist/klist]
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/simple.exp b/src/tests/testsuite/krb-standalone/simple.exp
|
|
|
8874ae |
similarity index 98%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/simple.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/simple.exp
|
|
|
8874ae |
index d8b218248..92b33066e 100644
|
|
|
8874ae |
--- a/src/tests/dejagnu/krb-standalone/simple.exp
|
|
|
8874ae |
+++ b/src/tests/testsuite/krb-standalone/simple.exp
|
|
|
8874ae |
@@ -2,7 +2,7 @@
|
|
|
8874ae |
# This is a DejaGnu test script.
|
|
|
8874ae |
# This script tests that krb-safe and krb-priv messages work.
|
|
|
8874ae |
|
|
|
8874ae |
-# This mostly just calls procedures in test/dejagnu/config/default.exp.
|
|
|
8874ae |
+# This mostly just calls procedures in test/testsuite/config/default.exp.
|
|
|
8874ae |
|
|
|
8874ae |
if ![info exists KLIST] {
|
|
|
8874ae |
set KLIST [findfile $objdir/../../clients/klist/klist]
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/standalone.exp b/src/tests/testsuite/krb-standalone/standalone.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/standalone.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/standalone.exp
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/krb-standalone/tcp.exp b/src/tests/testsuite/krb-standalone/tcp.exp
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/krb-standalone/tcp.exp
|
|
|
8874ae |
rename to src/tests/testsuite/krb-standalone/tcp.exp
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/ca.pem b/src/tests/testsuite/pkinit-certs/ca.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/ca.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/ca.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/generic.p12 b/src/tests/testsuite/pkinit-certs/generic.p12
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/generic.p12
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/generic.p12
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/generic.pem b/src/tests/testsuite/pkinit-certs/generic.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/generic.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/generic.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/kdc.pem b/src/tests/testsuite/pkinit-certs/kdc.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/kdc.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/kdc.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/make-certs.sh b/src/tests/testsuite/pkinit-certs/make-certs.sh
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/make-certs.sh
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/make-certs.sh
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/privkey-enc.pem b/src/tests/testsuite/pkinit-certs/privkey-enc.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/privkey-enc.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/privkey-enc.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/privkey.pem b/src/tests/testsuite/pkinit-certs/privkey.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/privkey.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/privkey.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-enc.p12 b/src/tests/testsuite/pkinit-certs/user-enc.p12
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-enc.p12
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-enc.p12
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.p12 b/src/tests/testsuite/pkinit-certs/user-upn.p12
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-upn.p12
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-upn.p12
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.pem b/src/tests/testsuite/pkinit-certs/user-upn.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-upn.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-upn.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.p12 b/src/tests/testsuite/pkinit-certs/user-upn2.p12
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-upn2.p12
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-upn2.p12
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.pem b/src/tests/testsuite/pkinit-certs/user-upn2.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-upn2.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-upn2.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.p12 b/src/tests/testsuite/pkinit-certs/user-upn3.p12
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-upn3.p12
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-upn3.p12
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.pem b/src/tests/testsuite/pkinit-certs/user-upn3.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user-upn3.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user-upn3.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user.p12 b/src/tests/testsuite/pkinit-certs/user.p12
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user.p12
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user.p12
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/pkinit-certs/user.pem b/src/tests/testsuite/pkinit-certs/user.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/pkinit-certs/user.pem
|
|
|
8874ae |
rename to src/tests/testsuite/pkinit-certs/user.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/ca.pem b/src/tests/testsuite/proxy-certs/ca.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/ca.pem
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/ca.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/make-certs.sh b/src/tests/testsuite/proxy-certs/make-certs.sh
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/make-certs.sh
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/make-certs.sh
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/proxy-badsig.pem b/src/tests/testsuite/proxy-certs/proxy-badsig.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/proxy-badsig.pem
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/proxy-badsig.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/proxy-ideal.pem b/src/tests/testsuite/proxy-certs/proxy-ideal.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/proxy-ideal.pem
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/proxy-ideal.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/proxy-no-match.pem b/src/tests/testsuite/proxy-certs/proxy-no-match.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/proxy-no-match.pem
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/proxy-no-match.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/proxy-san.pem b/src/tests/testsuite/proxy-certs/proxy-san.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/proxy-san.pem
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/proxy-san.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/proxy-certs/proxy-subject.pem b/src/tests/testsuite/proxy-certs/proxy-subject.pem
|
|
|
8874ae |
similarity index 100%
|
|
|
8874ae |
rename from src/tests/dejagnu/proxy-certs/proxy-subject.pem
|
|
|
8874ae |
rename to src/tests/testsuite/proxy-certs/proxy-subject.pem
|
|
|
8874ae |
diff --git a/src/tests/dejagnu/t_inetd.c b/src/tests/testsuite/t_inetd.c
|
|
|
8874ae |
similarity index 99%
|
|
|
8874ae |
rename from src/tests/dejagnu/t_inetd.c
|
|
|
8874ae |
rename to src/tests/testsuite/t_inetd.c
|
|
|
8874ae |
index abcde50fa..2bad2cf65 100644
|
|
|
8874ae |
--- a/src/tests/dejagnu/t_inetd.c
|
|
|
8874ae |
+++ b/src/tests/testsuite/t_inetd.c
|
|
|
8874ae |
@@ -1,5 +1,5 @@
|
|
|
8874ae |
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
|
|
|
8874ae |
-/* tests/dejagnu/t_inetd.c */
|
|
|
8874ae |
+/* tests/testsuite/t_inetd.c */
|
|
|
8874ae |
/*
|
|
|
8874ae |
* Copyright 1991 by the Massachusetts Institute of Technology.
|
|
|
8874ae |
* All Rights Reserved.
|
|
|
8874ae |
diff --git a/src/util/k5test.py b/src/util/k5test.py
|
|
|
8874ae |
index 251d11a9d..908a1495c 100644
|
|
|
8874ae |
--- a/src/util/k5test.py
|
|
|
8874ae |
+++ b/src/util/k5test.py
|
|
|
8874ae |
@@ -1383,7 +1383,7 @@ kswitch = os.path.join(buildtop, 'clients', 'kswitch', 'kswitch')
|
|
|
8874ae |
kvno = os.path.join(buildtop, 'clients', 'kvno', 'kvno')
|
|
|
8874ae |
kdestroy = os.path.join(buildtop, 'clients', 'kdestroy', 'kdestroy')
|
|
|
8874ae |
kpasswd = os.path.join(buildtop, 'clients', 'kpasswd', 'kpasswd')
|
|
|
8874ae |
-t_inetd = os.path.join(buildtop, 'tests', 'dejagnu', 't_inetd')
|
|
|
8874ae |
+t_inetd = os.path.join(buildtop, 'tests', 'testsuite', 't_inetd')
|
|
|
8874ae |
kproplog = os.path.join(buildtop, 'kprop', 'kproplog')
|
|
|
8874ae |
kpropd = os.path.join(buildtop, 'kprop', 'kpropd')
|
|
|
8874ae |
kprop = os.path.join(buildtop, 'kprop', 'kprop')
|
|
|
8874ae |
--
|
|
|
8874ae |
2.35.1
|
|
|
8874ae |
|