aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-05-31 10:30:44 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-05-31 10:30:44 +0200
commit1a212675c4217bbedfab1e181a88b2fbe4cfa9c4 (patch)
treef1115ad235ead91d8d09ad13cd35a211b7c35cf0 /lib/kernel/test
parent98f13e3c4cf6282e2114deb71805c54596ffdc8a (diff)
parent9e9627dd573a14fe604ecd05185afc0640d3517b (diff)
downloadotp-1a212675c4217bbedfab1e181a88b2fbe4cfa9c4.tar.gz
otp-1a212675c4217bbedfab1e181a88b2fbe4cfa9c4.tar.bz2
otp-1a212675c4217bbedfab1e181a88b2fbe4cfa9c4.zip
Merge branch 'egil/erts/cuddle-tests'
* egil/erts/cuddle-tests: stdlib: Fix small inconsistencies in ets_SUITE stdlib: Strengthen or relax test cases kernel: Don't test negative time values in file info erts: Fix free_mem calculation in bs_construct tests
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/prim_file_SUITE.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index cc7f2f6713..8be94f1e57 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -1023,7 +1023,7 @@ file_write_file_info_opts(Config) when is_list(Config) ->
Time <- [ 0,1,-1,100,-100,1000,-1000,10000,-10000 ]
]),
- %% REM: determine date range dependent on time_t = Uint32 | Sint32 | Sint64
+ %% REM: determine date range dependent on time_t = Uint32 | Sint32 | Sint64 | Uint64
%% Determine time_t on os:type()?
lists:foreach(fun ({FI, Opts}) ->
ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
@@ -1072,9 +1072,10 @@ file_write_read_file_info_opts(Config) when is_list(Config) ->
%ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
%ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
ok = file_write_read_file_info_opts(Handle, Name, 1, [{time, posix}]),
- ok = file_write_read_file_info_opts(Handle, Name, -1, [{time, posix}]),
+ %% will not work on platforms with unsigned time_t
+ %ok = file_write_read_file_info_opts(Handle, Name, -1, [{time, posix}]),
+ %ok = file_write_read_file_info_opts(Handle, Name, -300000, [{time, posix}]),
ok = file_write_read_file_info_opts(Handle, Name, 300000, [{time, posix}]),
- ok = file_write_read_file_info_opts(Handle, Name, -300000, [{time, posix}]),
ok = file_write_read_file_info_opts(Handle, Name, 0, [{time, posix}]),
ok = ?PRIM_FILE:stop(Handle),