diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rwxr-xr-x | tests/inittests | 2 | ||||
| -rw-r--r-- | tests/pkits/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/pkits/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/pkits/common.sh | 2 |
6 files changed, 19 insertions, 7 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 973235f32..fb07c4c00 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2009-02-19 Werner Koch <wk@g10code.com> + + * Makefile.am (TESTS_ENVIRONMENT): Use /bin/pwd. + * inittests: Ditto. Fixes bug#1001. + 2008-10-20 Werner Koch <wk@g10code.com> * asschk.c (cmd_echo): Mark unused arg. diff --git a/tests/Makefile.am b/tests/Makefile.am index 01013e0d8..c4693c01d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,9 +29,11 @@ SUBDIRS = ${openpgp} . pkits GPGSM = ../sm/gpgsm - -TESTS_ENVIRONMENT = GNUPGHOME=`pwd` GPG_AGENT_INFO= LC_ALL=C GPGSM=$(GPGSM) \ - $(srcdir)/runtest +# Note that we need to use /bin/pwd so that we don't get into trouble +# if the shell used for inittests would uses an internal version of +# pwd which handles symlinks differently. +TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \ + GPGSM=$(GPGSM) $(srcdir)/runtest testscripts = sm-sign+verify sm-verify diff --git a/tests/inittests b/tests/inittests index 05a94eb68..1a51bdfc5 100755 --- a/tests/inittests +++ b/tests/inittests @@ -51,7 +51,7 @@ if [ "$1" = "--clean" ]; then exit 0 fi -if [ "$GNUPGHOME" != "`pwd`" ]; then +if [ "$GNUPGHOME" != "`/bin/pwd`" ]; then echo "inittests: please set GNUPGHOME to the test directory" >&2 exit 1 fi diff --git a/tests/pkits/ChangeLog b/tests/pkits/ChangeLog index a4f35010c..185ff98bc 100644 --- a/tests/pkits/ChangeLog +++ b/tests/pkits/ChangeLog @@ -1,3 +1,8 @@ +2009-02-19 Werner Koch <wk@g10code.com> + + * Makefile.am (TESTS_ENVIRONMENT): Use /bin/pwd + * common.sh: Ditto. + 2008-02-19 Werner Koch <wk@g10code.com> * inittests: Unpack test data onlyu if available. diff --git a/tests/pkits/Makefile.am b/tests/pkits/Makefile.am index d28ab8914..6285da43c 100644 --- a/tests/pkits/Makefile.am +++ b/tests/pkits/Makefile.am @@ -20,8 +20,8 @@ GPGSM = ../../sm/gpgsm -TESTS_ENVIRONMENT = GNUPGHOME=`pwd` GPG_AGENT_INFO= LC_ALL=C GPGSM=$(GPGSM) \ - silent=yes +TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \ + GPGSM=$(GPGSM) silent=yes testscripts = import-all-certs validate-all-certs \ diff --git a/tests/pkits/common.sh b/tests/pkits/common.sh index e78456730..ca18b9501 100644 --- a/tests/pkits/common.sh +++ b/tests/pkits/common.sh @@ -42,7 +42,7 @@ SCRATCH="scratch.$$.tmp" MYTIME="20080508T120000" -if [ "$GNUPGHOME" != "`pwd`" ]; then +if [ "$GNUPGHOME" != "`/bin/pwd`" ]; then echo "inittests: please set GNUPGHOME to the tests/pkits directory" >&2 exit 1 fi |