diff options
| author | Raimo Niskanen <[email protected]> | 2010-12-02 17:13:58 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-12-02 17:13:58 +0100 |
| commit | 35a497151d6b9e6e2e42ffc4423adb305933f700 (patch) | |
| tree | 902f85d96fc7bf74f078fe40f0e772f8c2fde80e | |
| parent | 9def7dccb600818e0b3971a3ec1692247a3eefe3 (diff) | |
| parent | 62912283ddab4ab0bb133e5fab13d3b4cd7067d5 (diff) | |
| download | otp-35a497151d6b9e6e2e42ffc4423adb305933f700.tar.gz otp-35a497151d6b9e6e2e42ffc4423adb305933f700.tar.bz2 otp-35a497151d6b9e6e2e42ffc4423adb305933f700.zip | |
Merge branch 'raimo/windows-file-append-testcase' into dev
* raimo/windows-file-append-testcase:
Run KERNEL file_SUITE:large_file on more platforms
Add test case for append to file > 4 GB
| -rw-r--r-- | lib/kernel/test/file_SUITE.erl | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl index 17c47f871d..47592ddb14 100644 --- a/lib/kernel/test/file_SUITE.erl +++ b/lib/kernel/test/file_SUITE.erl @@ -3268,7 +3268,7 @@ large_file(Config) when is_list(Config) -> {{unix,sunos},{A,B,C}} when A == 5, B == 5, C >= 1; A == 5, B >= 6; A >= 6 -> do_large_file(Config); - {{unix,Unix},_} when Unix =:= linux; Unix =:= darwin -> + {{unix,Unix},_} when Unix =/= sunos -> N = unix_free(Config), io:format("Free: ~w KByte~n", [N]), if N < 5 * (1 bsl 20) -> @@ -3278,7 +3278,7 @@ large_file(Config) when is_list(Config) -> do_large_file(Config) end; _ -> - {skipped,"Only supported on Win32, Linux, or SunOS >= 5.5.1"} + {skipped,"Only supported on Win32, Unix or SunOS >= 5.5.1"} end. unix_free(Config) -> @@ -3290,7 +3290,7 @@ unix_free(Config) -> N. do_large_file(Config) -> - ?line Watchdog = ?t:timetrap(?t:minutes(4)), + ?line Watchdog = ?t:timetrap(?t:minutes(5)), %% ?line Name = filename:join(?config(priv_dir, Config), ?MODULE_STRING ++ "_large_file"), @@ -3329,6 +3329,17 @@ do_large_file(Config) -> ?line {ok,P} = ?FILE_MODULE:position(F, {eof,-L}), ?line {ok,Rs} = ?FILE_MODULE:read(F, L+1), ?line ok = ?FILE_MODULE:close(F), + %% Reopen the file with 'append'; used to fail on Windows causing + %% writes to go to the beginning of the file for files > 4GB. + ?line PL = P + L, + ?line PLL = PL + L, + ?line {ok,F1} = ?FILE_MODULE:open(Name, [raw,read,write,append]), + ?line ok = ?FILE_MODULE:write(F1, R), + ?line {ok,PLL} = ?FILE_MODULE:position(F1, {cur,0}), + ?line {ok,Rs} = ?FILE_MODULE:pread(F1, P, L), + ?line {ok,PL} = ?FILE_MODULE:position(F1, {eof,-L}), + ?line {ok,R} = ?FILE_MODULE:read(F1, L+1), + ?line ok = ?FILE_MODULE:close(F1), %% ?line Mref = erlang:monitor(process, Deleter), ?line Deleter ! {Tester,done}, |