From ea808c9c0efdbbb102e41d7bf01d6085d11f94ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 8 Feb 2007 00:59:47 +0000 Subject: [PATCH] use diffrent port, 49188, and hope that it isnt used, help on solaris where the help services runs on port 8888 git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20202 ec53bebd-3082-4978-b11e-865c3cabbd6b --- tests/gss/Makefile.am | 3 +++ tests/gss/check-context.in | 2 +- tests/gss/check-gssmask.in | 2 +- tests/gss/krb5.conf.in | 2 +- tests/kdc/Makefile.am | 3 +++ tests/kdc/check-digest.in | 2 +- tests/kdc/check-kdc.in | 2 +- tests/kdc/check-pkinit.in | 2 +- tests/kdc/check-uu.in | 2 +- tests/kdc/krb5-pkinit.conf.in | 2 +- tests/kdc/krb5.conf.in | 4 ++-- tests/plugin/.cvsignore | 1 + tests/plugin/Makefile.am | 3 +++ tests/plugin/check-pac.in | 2 +- tests/plugin/krb5.conf.in | 2 +- 15 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 tests/plugin/.cvsignore diff --git a/tests/gss/Makefile.am b/tests/gss/Makefile.am index ff8d4c5a2..cccb18291 100644 --- a/tests/gss/Makefile.am +++ b/tests/gss/Makefile.am @@ -10,7 +10,10 @@ TESTS = $(SCRIPT_TESTS) check_SCRIPTS = $(SCRIPT_TESTS) +port = 49188 + do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \ + -e 's,[@]port[@],$(port),g' \ -e 's,[@]objdir[@],$(top_builddir)/tests/gss,g' check-gss: check-gss.in Makefile diff --git a/tests/gss/check-context.in b/tests/gss/check-context.in index 184d10a53..fa6758737 100644 --- a/tests/gss/check-context.in +++ b/tests/gss/check-context.in @@ -42,7 +42,7 @@ objdir="@objdir@" R=TEST.H5L.SE -port=8888 +port=@port@ keytabfile=${objdir}/server.keytab keytab="FILE:${keytabfile}" diff --git a/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in index 72540d833..d94d20677 100644 --- a/tests/gss/check-gssmask.in +++ b/tests/gss/check-gssmask.in @@ -42,7 +42,7 @@ objdir="@objdir@" R=TEST.H5L.SE -port=8888 +port=@port@ kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" diff --git a/tests/gss/krb5.conf.in b/tests/gss/krb5.conf.in index 2ccd7ccf7..f16666206 100644 --- a/tests/gss/krb5.conf.in +++ b/tests/gss/krb5.conf.in @@ -9,7 +9,7 @@ [realms] TEST.H5L.SE = { - kdc = localhost:8888 + kdc = localhost:@port@ } [domain_realms] diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am index 0d3bf262c..15b881b3d 100644 --- a/tests/kdc/Makefile.am +++ b/tests/kdc/Makefile.am @@ -10,7 +10,10 @@ check_SCRIPTS = $(SCRIPT_TESTS) SCRIPT_TESTS = check-kdc check-digest check-pkinit check-uu TESTS = $(SCRIPT_TESTS) +port = 49188 + do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \ + -e 's,[@]port[@],$(port),g' \ -e 's,[@]objdir[@],$(top_builddir)/tests/kdc,g' \ -e 's,[@]EGREP[@],$(EGREP),g' diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in index 290148eb1..2089db090 100644 --- a/tests/kdc/check-digest.in +++ b/tests/kdc/check-digest.in @@ -42,7 +42,7 @@ objdir="@objdir@" R=TEST.H5L.SE -port=8888 +port=@port@ kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in index 6e5d492c7..b0a2dfdbc 100644 --- a/tests/kdc/check-kdc.in +++ b/tests/kdc/check-kdc.in @@ -46,7 +46,7 @@ testfailed="echo test failed; cat messages.log; exit 1" R=TEST.H5L.SE R2=TEST2.H5L.SE -port=8888 +port=@port@ kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in index 0001b470e..c4687532b 100644 --- a/tests/kdc/check-pkinit.in +++ b/tests/kdc/check-pkinit.in @@ -45,7 +45,7 @@ testfailed="echo test failed; cat messages.log; exit 1" R=TEST.H5L.SE -port=8888 +port=@port@ kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" diff --git a/tests/kdc/check-uu.in b/tests/kdc/check-uu.in index cabf600e7..2dd88b25f 100644 --- a/tests/kdc/check-uu.in +++ b/tests/kdc/check-uu.in @@ -47,7 +47,7 @@ R=TEST.H5L.SE uuspid= -port=8888 +port=@port@ kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" diff --git a/tests/kdc/krb5-pkinit.conf.in b/tests/kdc/krb5-pkinit.conf.in index d13468903..1b9da856c 100644 --- a/tests/kdc/krb5-pkinit.conf.in +++ b/tests/kdc/krb5-pkinit.conf.in @@ -9,7 +9,7 @@ [realms] TEST.H5L.SE = { - kdc = localhost:8888 + kdc = localhost:@port@ } [kdc] diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in index 13b4abbc9..58202ce80 100644 --- a/tests/kdc/krb5.conf.in +++ b/tests/kdc/krb5.conf.in @@ -9,10 +9,10 @@ [realms] TEST.H5L.SE = { - kdc = localhost:8888 + kdc = localhost:@port@ } TEST2.H5L.SE = { - kdc = localhost:8888 + kdc = localhost:@port@ } [kdc] diff --git a/tests/plugin/.cvsignore b/tests/plugin/.cvsignore new file mode 100644 index 000000000..70845e08e --- /dev/null +++ b/tests/plugin/.cvsignore @@ -0,0 +1 @@ +Makefile.in diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am index ae53eeecd..deddbcc2e 100644 --- a/tests/plugin/Makefile.am +++ b/tests/plugin/Makefile.am @@ -7,7 +7,10 @@ noinst_DATA = krb5.conf SCRIPT_TESTS = check-pac TESTS = $(SCRIPT_TESTS) +port = 49188 + do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \ + -e 's,[@]port[@],$(port),g' \ -e 's,[@]objdir[@],$(top_builddir)/tests/plugin,g' \ -e 's,[@]EGREP[@],$(EGREP),g' diff --git a/tests/plugin/check-pac.in b/tests/plugin/check-pac.in index a501a1668..d3a1b6168 100644 --- a/tests/plugin/check-pac.in +++ b/tests/plugin/check-pac.in @@ -45,7 +45,7 @@ testfailed="echo test failed; cat messages.log; exit 1" R=TEST.H5L.SE -port=8888 +port=@port@ kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r ${R}" kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port" diff --git a/tests/plugin/krb5.conf.in b/tests/plugin/krb5.conf.in index 8a0a229ff..2e4e9aed6 100644 --- a/tests/plugin/krb5.conf.in +++ b/tests/plugin/krb5.conf.in @@ -11,7 +11,7 @@ [realms] TEST.H5L.SE = { - kdc = localhost:8888 + kdc = localhost:@port@ } [kdc]