diff options
| author | Erlang/OTP <[email protected]> | 2018-10-12 17:12:04 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-10-12 17:12:04 +0200 |
| commit | 773d665794a6cfd6a95ef024666980fb68ab9dac (patch) | |
| tree | fa160ac7900f2cfe8a6cb0390a675a69dea7bda2 /lib/kernel/test/prim_file_SUITE.erl | |
| parent | 2197249f2407e4912d461c627370b9838709d2f2 (diff) | |
| parent | 1997b6b57d755e25d4050043450bb3cc7b229189 (diff) | |
| download | otp-773d665794a6cfd6a95ef024666980fb68ab9dac.tar.gz otp-773d665794a6cfd6a95ef024666980fb68ab9dac.tar.bz2 otp-773d665794a6cfd6a95ef024666980fb68ab9dac.zip | |
Merge branch 'john/erts/fix-unc-paths-windows/OTP-15333/ERL-737' into maint-21
* john/erts/fix-unc-paths-windows/OTP-15333/ERL-737:
erts: Fix UNC path handling on Windows
erts: Fix a compiler warning
Diffstat (limited to 'lib/kernel/test/prim_file_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/prim_file_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl index a02b5f87d1..2f465a15bc 100644 --- a/lib/kernel/test/prim_file_SUITE.erl +++ b/lib/kernel/test/prim_file_SUITE.erl @@ -1300,7 +1300,8 @@ e_delete(Config) when is_list(Config) -> case os:type() of {win32, _} -> %% Remove a character device. - {error, eacces} = ?PRIM_FILE:delete("nul"); + expect({error, eacces}, {error, einval}, + ?PRIM_FILE:delete("nul")); _ -> ?PRIM_FILE:write_file_info( Base, #file_info {mode=0}), |