diff options
| author | Björn Gustavsson <[email protected]> | 2012-09-17 11:40:19 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-09-17 11:40:19 +0200 |
| commit | b58ce62a0cf296ca8cd8cd77b053bc70ecf28758 (patch) | |
| tree | 19a7d3deb9b4009d63648e939099bb1fba4877f0 /lib/stdlib/test/filelib_SUITE.erl | |
| parent | 39e413c4129b3bf226f4168713e3a70bfffeef0d (diff) | |
| parent | 70b5e24c9498225fadc08d19503269c8aad851bf (diff) | |
| download | otp-b58ce62a0cf296ca8cd8cd77b053bc70ecf28758.tar.gz otp-b58ce62a0cf296ca8cd8cd77b053bc70ecf28758.tar.bz2 otp-b58ce62a0cf296ca8cd8cd77b053bc70ecf28758.zip | |
Merge branch 'bjorn/stdlib/filelib-wildcard/OTP-6874'
* bjorn/stdlib/filelib-wildcard/OTP-6874:
Fix filelib:wildcard/2
Diffstat (limited to 'lib/stdlib/test/filelib_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/filelib_SUITE.erl | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl index 1de639a166..94da355f36 100644 --- a/lib/stdlib/test/filelib_SUITE.erl +++ b/lib/stdlib/test/filelib_SUITE.erl @@ -176,9 +176,19 @@ do_wildcard_5(Dir, Wcf) -> %% Cleanup ?line del(Files), - ?line foreach(fun(D) -> ok = file:del_dir(filename:join(Dir, D)) end, Dirs). - - + ?line foreach(fun(D) -> ok = file:del_dir(filename:join(Dir, D)) end, Dirs), + do_wildcard_6(Dir, Wcf). + +do_wildcard_6(Dir, Wcf) -> + ok = file:make_dir(filename:join(Dir, "xbin")), + All = ["xbin/a.x","xbin/b.x","xbin/c.x"], + Files = mkfiles(All, Dir), + All = Wcf("xbin/*.x"), + All = Wcf("xbin/*"), + ["xbin"] = Wcf("*"), + All = Wcf("*/*"), + del(Files), + ok = file:del_dir(filename:join(Dir, "xbin")). fold_files(Config) when is_list(Config) -> ?line Dir = filename:join(?config(priv_dir, Config), "fold_files"), |