summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am24
-rw-r--r--tests/TESTS2
-rw-r--r--tests/lib/userinfo-t.c (renamed from tests/lib/webkdc-info-t.c)2
4 files changed, 14 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index fd9ab3c9..9200f77b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,9 +49,9 @@
/tests/lib/krb5-t
/tests/lib/krb5-tgt-t
/tests/lib/random-t
+/tests/lib/userinfo-t
/tests/lib/token-decode-t
/tests/lib/token-encode-t
-/tests/lib/webkdc-info-t
/tests/lib/webkdc-krb-t
/tests/lib/webkdc-login-t
/tests/lib/webkdc-mf-t
diff --git a/Makefile.am b/Makefile.am
index c119e991..da193252 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -271,14 +271,13 @@ warnings:
check_PROGRAMS = tests/runtests tests/lib/attrs-t tests/lib/base64-t \
tests/lib/factors-t tests/lib/hex-t tests/lib/interval-t \
tests/lib/keyring-t tests/lib/keys-t tests/lib/krb5-t \
- tests/lib/krb5-tgt-t tests/lib/token-decode-t \
- tests/lib/token-encode-t tests/lib/webkdc-info-t \
- tests/lib/webkdc-krb-t tests/lib/webkdc-login-t \
- tests/lib/webkdc-mf-t tests/portable/asprintf-t \
- tests/portable/mkstemp-t tests/portable/setenv-t \
- tests/portable/snprintf-t tests/portable/strlcat-t \
- tests/portable/strlcpy-t tests/util/concat-t tests/util/messages-t \
- tests/util/xmalloc
+ tests/lib/krb5-tgt-t tests/lib/userinfo-t tests/lib/token-decode-t \
+ tests/lib/token-encode-t tests/lib/webkdc-krb-t \
+ tests/lib/webkdc-login-t tests/lib/webkdc-mf-t \
+ tests/portable/asprintf-t tests/portable/mkstemp-t \
+ tests/portable/setenv-t tests/portable/snprintf-t \
+ tests/portable/strlcat-t tests/portable/strlcpy-t \
+ tests/util/concat-t tests/util/messages-t tests/util/xmalloc
tests_runtests_CPPFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \
-DBUILD='"$(abs_top_builddir)/tests"'
check_LIBRARIES = tests/tap/libtap.a
@@ -312,15 +311,14 @@ tests_lib_krb5_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
tests_lib_krb5_tgt_t_LDFLAGS = $(KRB5_LDFLAGS)
tests_lib_krb5_tgt_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
util/libutil.a portable/libportable.la $(KRB5_LIBS)
+tests_lib_userinfo_t_CPPFLAGS = $(APR_CPPFLAGS) $(AM_CPPFLAGS)
+tests_lib_userinfo_t_LDFLAGS = $(APR_LDFLAGS) $(KRB5_LDFLAGS)
+tests_lib_userinfo_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
+ util/libutil.a portable/libportable.la $(APR_LIBS) $(KRB5_LIBS)
tests_lib_token_decode_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
util/libutil.a portable/libportable.la
tests_lib_token_encode_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
util/libutil.a portable/libportable.la
-tests_lib_webkdc_info_t_CPPFLAGS = -DPATH_REMCTLD='"$(PATH_REMCTLD)"' \
- $(APR_CPPFLAGS) $(AM_CPPFLAGS)
-tests_lib_webkdc_info_t_LDFLAGS = $(APR_LDFLAGS) $(KRB5_LDFLAGS)
-tests_lib_webkdc_info_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
- util/libutil.a portable/libportable.la $(APR_LIBS) $(KRB5_LIBS)
tests_lib_webkdc_krb_t_CPPFLAGS = $(APR_CPPFLAGS) $(AM_CPPFLAGS)
tests_lib_webkdc_krb_t_LDFLAGS = $(APR_LDFLAGS) $(KRB5_LDFLAGS)
tests_lib_webkdc_krb_t_LDADD = tests/tap/libtap.a lib/libwebauth.la \
diff --git a/tests/TESTS b/tests/TESTS
index d9d72513..1d87500f 100644
--- a/tests/TESTS
+++ b/tests/TESTS
@@ -7,9 +7,9 @@ lib/keyring
lib/keys
lib/krb5
lib/krb5-tgt
+lib/userinfo
lib/token-decode
lib/token-encode
-lib/webkdc-info
lib/webkdc-krb
lib/webkdc-login
lib/webkdc-mf
diff --git a/tests/lib/webkdc-info-t.c b/tests/lib/userinfo-t.c
index d4ee9ab1..b27bddb4 100644
--- a/tests/lib/webkdc-info-t.c
+++ b/tests/lib/userinfo-t.c
@@ -1,5 +1,5 @@
/*
- * Test WebKDC user information retrieval.
+ * Test user information service retrieval.
*
* Written by Russ Allbery <rra@stanford.edu>
* Copyright 2011, 2012