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/stdlib/test/filelib_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/stdlib/test/filelib_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/filelib_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl index dc4563967c..1de639a166 100644 --- a/lib/stdlib/test/filelib_SUITE.erl +++ b/lib/stdlib/test/filelib_SUITE.erl @@ -244,7 +244,7 @@ otp_5960(doc) -> ["Test that filelib:ensure_dir/1 returns ok or {error,Reason}"]; otp_5960(Config) when is_list(Config) -> ?line PrivDir = ?config(priv_dir, Config), - ?line Dir = filename:join(PrivDir, otp_5960_dir), + ?line Dir = filename:join(PrivDir, "otp_5960_dir"), ?line Name1 = filename:join(Dir, name1), ?line Name2 = filename:join(Dir, name2), ?line ok = filelib:ensure_dir(Name1), % parent is created @@ -269,7 +269,7 @@ otp_5960(Config) when is_list(Config) -> ensure_dir_eexist(Config) when is_list(Config) -> ?line PrivDir = ?config(priv_dir, Config), - ?line Dir = filename:join(PrivDir, ensure_dir_eexist), + ?line Dir = filename:join(PrivDir, "ensure_dir_eexist"), ?line Name = filename:join(Dir, "same_name_as_file_and_dir"), ?line ok = filelib:ensure_dir(Name), ?line ok = file:write_file(Name, <<"some string\n">>), |