diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2020-05-05 22:05:49 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2020-05-06 19:33:20 +0200 |
| commit | 2d1745fe2cd3ac9981225ac6367de059894e9c14 (patch) | |
| tree | 5492153467d063957bf45c8ab12563d3cd71b085 | |
| parent | e1d81b52c0e3207163c18d5b0258e8dd1ab85d1e (diff) | |
test613.pl: make tests 613 and 614 work with OpenSSH for Windows
OpenSSH for Windows shows group and other/world permissions as *,
because those concepts do not exist on Windows. It also does not
show the current or parent directory, so we just ignore those.
Reviewed-by: Daniel Stenberg
Closes #5328
| -rw-r--r-- | tests/data/test613 | 2 | ||||
| -rw-r--r-- | tests/data/test614 | 2 | ||||
| -rwxr-xr-x | tests/libtest/test613.pl | 20 |
3 files changed, 17 insertions, 7 deletions
diff --git a/tests/data/test613 b/tests/data/test613 index fcb983771..0383987e5 100644 --- a/tests/data/test613 +++ b/tests/data/test613 @@ -10,8 +10,6 @@ directory # Server-side <reply> <datacheck> -d????????? N U U N ??? N NN:NN . -d????????? N U U N ??? N NN:NN .. d????????? N U U N ??? N NN:NN asubdir -rw?rw?rw? 1 U U 37 Jan 1 2000 plainfile.txt -r-?r-?r-? 1 U U 47 Dec 31 2000 rofile.txt diff --git a/tests/data/test614 b/tests/data/test614 index 95a86c562..c6fe4919d 100644 --- a/tests/data/test614 +++ b/tests/data/test614 @@ -11,8 +11,6 @@ directory # Server-side <reply> <datacheck> -d????????? N U U N ??? N NN:NN . -d????????? N U U N ??? N NN:NN .. d????????? N U U N ??? N NN:NN asubdir -r-?r-?r-? 1 U U 37 Jan 1 2000 plainfile.txt -r-?r-?r-? 1 U U 47 Dec 31 2000 rofile.txt diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl index ead1159ff..8efc05ca0 100755 --- a/tests/libtest/test613.pl +++ b/tests/libtest/test613.pl @@ -97,15 +97,29 @@ elsif ($ARGV[0] eq "postprocess") my @canondir; open(IN, "<$logfile") || die "$!"; while (<IN>) { - /^(.)(..).(..).(..).\s*(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+\s+\S+\s+\S+)(.*)$/; + /^(.)(..).(..).(..).\s*(\S+)\s+\S+\s+\S+\s+(\S+)\s+(\S+\s+\S+\s+\S+)\s+(.*)$/; if ($1 eq "d") { + # Skip current and parent directory listing, because some SSH + # servers (eg. OpenSSH for Windows) are not listing those + if ($8 eq "." || $8 eq "..") { + next; + } # Erase all directory metadata except for the name, as it is not # consistent for across all test systems and filesystems - push @canondir, "d????????? N U U N ??? N NN:NN$8\n"; + push @canondir, "d????????? N U U N ??? N NN:NN $8\n"; } elsif ($1 eq "-") { + # Replace missing group and other permissions with user + # permissions (eg. on Windows) due to them being shown as * + my ($u, $g, $o) = ($2, $3, $4); + if($g eq "**") { + $g = $u; + } + if($o eq "**") { + $o = $u; + } # Erase user and group names, as they are not consistent across # all test systems - my $line = sprintf("%s%s?%s?%s?%5d U U %15d %s%s\n", $1,$2,$3,$4,$5,$6,$7,$8); + my $line = sprintf("%s%s?%s?%s?%5d U U %15d %s %s\n", $1,$u,$g,$o,$5,$6,$7,$8); push @canondir, $line; } else { # Unexpected format; just pass it through and let the test fail |