diff options
author | Hans Bolinder <[email protected]> | 2011-09-02 08:43:14 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2011-09-02 08:43:14 +0200 |
commit | 1eac5476aa7faad600bb940ca3fe07be78273425 (patch) | |
tree | c5d73b53f588503d3f872e413716b3a9b2e3c91b /lib/kernel/test/ram_file_SUITE.erl | |
parent | 8fc59a1ff776a472299db26b175da09a03b3d30b (diff) | |
parent | bb94e589c8495caf7c1fa6ebe808f6983ceaf44a (diff) | |
download | otp-1eac5476aa7faad600bb940ca3fe07be78273425.tar.gz otp-1eac5476aa7faad600bb940ca3fe07be78273425.tar.bz2 otp-1eac5476aa7faad600bb940ca3fe07be78273425.zip |
Merge branch 'dev' into major
* dev:
Fix a couple of minor bugs with hook priority
Update to reflect addition of CTH priority addition
Update CTH priority default to be 0
Update to reflect new cth callback api
Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} instead of NewState.
Add priority functionality and tests for ct hooks
Update internal hooks state to use a record instead of tuples
Improve and correct types and specifications in Kernel and STDLIB
Diffstat (limited to 'lib/kernel/test/ram_file_SUITE.erl')
-rw-r--r-- | lib/kernel/test/ram_file_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl index 9b3fbb91fc..ab95a3ff5f 100644 --- a/lib/kernel/test/ram_file_SUITE.erl +++ b/lib/kernel/test/ram_file_SUITE.erl @@ -552,7 +552,7 @@ large_file_light(Config) when is_list(Config) -> ?line PrivDir = ?config(priv_dir, Config), %% Marker for next test case that is to heavy to run in a suite. ?line ok = ?FILE_MODULE:write_file( - filename:join(PrivDir, large_file_light), + filename:join(PrivDir, "large_file_light"), <<"TAG">>), %% ?line Data = "abcdefghijklmnopqrstuvwzyz", @@ -582,7 +582,7 @@ large_file_heavy(Config) when is_list(Config) -> ?line PrivDir = ?config(priv_dir, Config), %% Check previous test case marker. case ?FILE_MODULE:read_file_info( - filename:join(PrivDir, large_file_light)) of + filename:join(PrivDir, "large_file_light")) of {ok,_} -> {skipped,"Too heavy for casual testing!"}; _ -> |