157 lines
6.5 KiB
Diff
157 lines
6.5 KiB
Diff
|
From 10b32480395a01798b21818e884a593930b400d1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julien Rische <jrische@redhat.com>
|
||
|
|
Date: Wed, 27 Apr 2022 15:29:08 +0200
|
||
|
|
Subject: [PATCH] Fix dejagnu unit tests directory name for RPC lib
|
||
|
|
|
||
|
|
This commit renames RPC library's unit tests directory to match the
|
||
|
|
newly enforced naming convention of dejagnu.
|
||
|
|
|
||
|
|
Resolves: rhbz#2070879
|
||
|
|
|
||
|
|
Signed-off-by: Julien Rische <jrische@redhat.com>
|
||
|
|
---
|
||
|
|
src/configure.ac | 2 +-
|
||
|
|
src/lib/rpc/Makefile.in | 2 +-
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/Makefile.in | 10 +++++-----
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/client.c | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/config/unix.exp | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/deps | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/lib/helpers.exp | 0
|
||
|
|
.../rpc/{unit-test => testsuite}/rpc_test.0/expire.exp | 0
|
||
|
|
.../{unit-test => testsuite}/rpc_test.0/fullrun.exp | 0
|
||
|
|
.../rpc/{unit-test => testsuite}/rpc_test.0/gsserr.exp | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/rpc_test.h | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/rpc_test.x | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/rpc_test_clnt.c | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/rpc_test_svc.c | 0
|
||
|
|
src/lib/rpc/{unit-test => testsuite}/server.c | 0
|
||
|
|
15 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/Makefile.in (93%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/client.c (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/config/unix.exp (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/deps (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/lib/helpers.exp (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test.0/expire.exp (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test.0/fullrun.exp (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test.0/gsserr.exp (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test.h (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test.x (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test_clnt.c (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/rpc_test_svc.c (100%)
|
||
|
|
rename src/lib/rpc/{unit-test => testsuite}/server.c (100%)
|
||
|
|
|
||
|
|
diff --git a/src/configure.ac b/src/configure.ac
|
||
|
|
index 37e36b76d..2a48aa83d 100644
|
||
|
|
--- a/src/configure.ac
|
||
|
|
+++ b/src/configure.ac
|
||
|
|
@@ -1497,7 +1497,7 @@ V5_AC_OUTPUT_MAKEFILE(.
|
||
|
|
lib/gssapi lib/gssapi/generic lib/gssapi/krb5 lib/gssapi/spnego
|
||
|
|
lib/gssapi/mechglue
|
||
|
|
|
||
|
|
- lib/rpc lib/rpc/unit-test
|
||
|
|
+ lib/rpc lib/rpc/testsuite
|
||
|
|
|
||
|
|
lib/kadm5 lib/kadm5/clnt lib/kadm5/srv lib/kadm5/testsuite
|
||
|
|
lib/krad
|
||
|
|
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
|
||
|
|
index 6b5f1e70a..78c7a1326 100644
|
||
|
|
--- a/src/lib/rpc/Makefile.in
|
||
|
|
+++ b/src/lib/rpc/Makefile.in
|
||
|
|
@@ -2,7 +2,7 @@ mydir=lib$(S)rpc
|
||
|
|
BUILDTOP=$(REL)..$(S)..
|
||
|
|
DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
|
||
|
|
|
||
|
|
-SUBDIRS=unit-test
|
||
|
|
+SUBDIRS=testsuite
|
||
|
|
|
||
|
|
##DOSBUILDTOP = ..\..
|
||
|
|
##DOSLIBNAME=libgssrpc.lib
|
||
|
|
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/testsuite/Makefile.in
|
||
|
|
similarity index 93%
|
||
|
|
rename from src/lib/rpc/unit-test/Makefile.in
|
||
|
|
rename to src/lib/rpc/testsuite/Makefile.in
|
||
|
|
index 0b6e5203d..0fab26c10 100644
|
||
|
|
--- a/src/lib/rpc/unit-test/Makefile.in
|
||
|
|
+++ b/src/lib/rpc/testsuite/Makefile.in
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-mydir=lib$(S)rpc$(S)unit-test
|
||
|
|
+mydir=lib$(S)rpc$(S)testsuite
|
||
|
|
BUILDTOP=$(REL)..$(S)..$(S)..
|
||
|
|
|
||
|
|
OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o
|
||
|
|
@@ -34,19 +34,19 @@ runenv.exp: Makefile
|
||
|
|
# rm -f rpc_test.h rpc_test_clnt.c rpc_test_svc.c
|
||
|
|
#
|
||
|
|
|
||
|
|
-check unit-test: unit-test-@DO_TEST@
|
||
|
|
+check testsuite: testsuite-@DO_TEST@
|
||
|
|
|
||
|
|
-unit-test-:
|
||
|
|
+testsuite-:
|
||
|
|
@echo "+++"
|
||
|
|
@echo "+++ WARNING: lib/rpc unit tests not run."
|
||
|
|
@echo "+++ Either tcl, runtest, or Perl is unavailable."
|
||
|
|
@echo "+++"
|
||
|
|
@echo 'Skipped rpc tests: runtest or Perl not found' >> $(SKIPTESTS)
|
||
|
|
|
||
|
|
-unit-test-ok: unit-test-body
|
||
|
|
+testsuite-ok: testsuite-body
|
||
|
|
|
||
|
|
PASS=@PASS@
|
||
|
|
-unit-test-body: runenv.sh runenv.exp
|
||
|
|
+testsuite-body: runenv.sh runenv.exp
|
||
|
|
$(RM) krb5cc_rpc_test_*
|
||
|
|
$(ENV_SETUP) $(VALGRIND) $(START_SERVERS)
|
||
|
|
RPC_TEST_KEYTAB=/tmp/rpc_test_keytab.$$$$ ; export RPC_TEST_KEYTAB ; \
|
||
|
|
diff --git a/src/lib/rpc/unit-test/client.c b/src/lib/rpc/testsuite/client.c
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/client.c
|
||
|
|
rename to src/lib/rpc/testsuite/client.c
|
||
|
|
diff --git a/src/lib/rpc/unit-test/config/unix.exp b/src/lib/rpc/testsuite/config/unix.exp
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/config/unix.exp
|
||
|
|
rename to src/lib/rpc/testsuite/config/unix.exp
|
||
|
|
diff --git a/src/lib/rpc/unit-test/deps b/src/lib/rpc/testsuite/deps
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/deps
|
||
|
|
rename to src/lib/rpc/testsuite/deps
|
||
|
|
diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/testsuite/lib/helpers.exp
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/lib/helpers.exp
|
||
|
|
rename to src/lib/rpc/testsuite/lib/helpers.exp
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test.0/expire.exp b/src/lib/rpc/testsuite/rpc_test.0/expire.exp
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test.0/expire.exp
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test.0/expire.exp
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp b/src/lib/rpc/testsuite/rpc_test.0/fullrun.exp
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test.0/fullrun.exp
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp b/src/lib/rpc/testsuite/rpc_test.0/gsserr.exp
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test.0/gsserr.exp
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test.h b/src/lib/rpc/testsuite/rpc_test.h
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test.h
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test.h
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test.x b/src/lib/rpc/testsuite/rpc_test.x
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test.x
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test.x
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test_clnt.c b/src/lib/rpc/testsuite/rpc_test_clnt.c
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test_clnt.c
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test_clnt.c
|
||
|
|
diff --git a/src/lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/testsuite/rpc_test_svc.c
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/rpc_test_svc.c
|
||
|
|
rename to src/lib/rpc/testsuite/rpc_test_svc.c
|
||
|
|
diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/testsuite/server.c
|
||
|
|
similarity index 100%
|
||
|
|
rename from src/lib/rpc/unit-test/server.c
|
||
|
|
rename to src/lib/rpc/testsuite/server.c
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|