diff options
| author | Bart Schaefer <schaefer@zsh.org> | 2022-04-11 15:45:42 -0700 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2022-04-11 15:45:42 -0700 |
| commit | f4fb3e7f047b731c5cd52d3c0b6cedcd75d9b4b9 (patch) | |
| tree | 0b6945d6b22bec81d8cddee9d18761a761478488 | |
| parent | 1039b09c0c897731b2fbd8b1fb14bf6155007ab5 (diff) | |
| download | zsh-f4fb3e7f047b731c5cd52d3c0b6cedcd75d9b4b9.tar.gz zsh-f4fb3e7f047b731c5cd52d3c0b6cedcd75d9b4b9.tar.xz zsh-f4fb3e7f047b731c5cd52d3c0b6cedcd75d9b4b9.zip | |
50043: avoid spurious test failures when "make check" as root
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Test/D02glob.ztst | 12 | ||||
| -rw-r--r-- | Test/E03posix.ztst | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 10b7ac945..e83c46afc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2022-04-11 Bart Schaefer <schaefer@zsh.org> + + * 50043: Test/D02glob.ztst, Test/E03posix.ztst: for root user, + skip glob tests that rely on limited privilege and fix EUID test + 2022-04-11 Mikael Magnusson <mikachu@gmail.com> * 50042: Src/Zle/compcore.c: Another fix for 49915 diff --git a/Test/D02glob.ztst b/Test/D02glob.ztst index 72891a2a7..850a535e5 100644 --- a/Test/D02glob.ztst +++ b/Test/D02glob.ztst @@ -748,13 +748,21 @@ touch glob.tmp/secret-d$1/dir/file chmod $1 glob.tmp/secret-d$1 done - print -raC 2 -- glob.tmp/secret-*/* glob.tmp/secret-*/file + if (( EUID == 0 )); then + ZTST_skip='Not testing unreadable directories (root reads anything)' + else + print -raC 2 -- glob.tmp/secret-*/* glob.tmp/secret-*/file + fi 0:names inside unreadable directories can be globbed if searchable >glob.tmp/secret-d444/dir glob.tmp/secret-d444/file >glob.tmp/secret-s444/dir glob.tmp/secret-s444/file >glob.tmp/secret-d111/file glob.tmp/secret-s111/file - print -rC 2 -- glob.tmp/secret-*/dir/* + if (( EUID == 0 )); then + ZTST_skip='Not testing unreadable directories (root reads anything)' + else + print -rC 2 -- glob.tmp/secret-*/dir/* + fi 0:glob files in readable directories inside unreadable directories >glob.tmp/secret-d111/dir/file glob.tmp/secret-s111/dir/file diff --git a/Test/E03posix.ztst b/Test/E03posix.ztst index caab97ab6..6ac4d1732 100644 --- a/Test/E03posix.ztst +++ b/Test/E03posix.ztst @@ -153,7 +153,7 @@ F:This may also need to apply to multibyte whitespace F:POSIX has neither math functions nor floating point >42 - ARGV0=sh $ZTST_testdir/../Src/zsh -c 'EUID=10; echo "$EUID"' + ARGV0=sh $ZTST_testdir/../Src/zsh -c 'EUID=1; EUID=10; echo $EUID' -f:EUID is not a special variable >10 |