github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-23 11:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix file existence checks

Browse source
This commit is contained in:
Tuncer Ayaz 2011-01-29 17:37:15 +01:00
parent 0e729bf90e
commit b18194e24d
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inttest/tdeps1/tdeps1_rt.erl
View file

@ -33,7 +33,7 @@ run(Dir) ->
{ok, _} = retest_sh:run("./rebar get-deps compile", []), {ok, _} = retest_sh:run("./rebar get-deps compile", []),
true = filelib:is_file("ebin/a.beam"), true = filelib:is_regular("ebin/a.beam"),
ok. ok.

6
test/rebar_eunit_tests.erl
View file

@ -119,7 +119,7 @@ environment_test_() ->
?_assert(filelib:is_dir(?TMP_DIR))}, ?_assert(filelib:is_dir(?TMP_DIR))},
{"Ensure the rebar script can be found, copied, and run", {"Ensure the rebar script can be found, copied, and run",
[?_assert(filelib:is_file(?REBAR_SCRIPT)), [?_assert(filelib:is_regular(?REBAR_SCRIPT)),
fun assert_rebar_runs/0]}]}. fun assert_rebar_runs/0]}]}.
assert_rebar_runs() -> assert_rebar_runs() ->
@ -236,12 +236,12 @@ assert_dirs_in(Name, [Dir|T]) ->
assert_dirs_in(_, []) -> []. assert_dirs_in(_, []) -> [].
assert_files_in(Name, [File|T]) -> assert_files_in(Name, [File|T]) ->
[{Name ++ " has file: " ++ File, ?_assert(filelib:is_file(File))} | [{Name ++ " has file: " ++ File, ?_assert(filelib:is_regular(File))} |
assert_files_in(Name, T)]; assert_files_in(Name, T)];
assert_files_in(_, []) -> []. assert_files_in(_, []) -> [].
assert_files_not_in(Name, [File|T]) -> assert_files_not_in(Name, [File|T]) ->
[{Name ++ " does not have file: " ++ File, ?_assertNot(filelib:is_file(File))} | [{Name ++ " does not have file: " ++ File, ?_assertNot(filelib:is_regular(File))} |
assert_files_not_in(Name, T)]; assert_files_not_in(Name, T)];
assert_files_not_in(_, []) -> []. assert_files_not_in(_, []) -> [].

14
test/rebar_file_utils_tests.erl
View file

@ -96,7 +96,7 @@ cp_r_file_to_file_test_() ->
filename:join([?TMP_DIR,"dest","new_file"])) filename:join([?TMP_DIR,"dest","new_file"]))
end, end,
fun teardown/1, fun teardown/1,
[?_assert(filelib:is_file(filename:join([?TMP_DIR,"dest","new_file"])))]}. [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","new_file"])))]}.
cp_r_file_to_dir_test_() -> cp_r_file_to_dir_test_() ->
{"cp_r copies a file to directory", {"cp_r copies a file to directory",
@ -107,7 +107,7 @@ cp_r_file_to_dir_test_() ->
filename:join([?TMP_DIR,"dest"])) filename:join([?TMP_DIR,"dest"]))
end, end,
fun teardown/1, fun teardown/1,
[?_assert(filelib:is_file(filename:join([?TMP_DIR,"dest","file1"])))]}. [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","file1"])))]}.
cp_r_dir_to_dir_test_() -> cp_r_dir_to_dir_test_() ->
{"cp_r copies a directory to directory", {"cp_r copies a directory to directory",
@ -132,7 +132,7 @@ cp_r_wildcard_file_to_dir_test_() ->
filename:join([?TMP_DIR,"dest"])) filename:join([?TMP_DIR,"dest"]))
end, end,
fun teardown/1, fun teardown/1,
[?_assert(filelib:is_file(filename:join([?TMP_DIR,"dest","file1"])))]}. [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","file1"])))]}.
cp_r_wildcard_dir_to_dir_test_() -> cp_r_wildcard_dir_to_dir_test_() ->
{"cp_r copies wildcard directory to directory", {"cp_r copies wildcard directory to directory",
@ -224,8 +224,8 @@ mv_file_test_() ->
filename:join([?TMP_DIR,"dest"])) filename:join([?TMP_DIR,"dest"]))
end, end,
fun teardown/1, fun teardown/1,
[?_assert(filelib:is_file(filename:join([?TMP_DIR,"dest","file1"]))), [?_assert(filelib:is_regular(filename:join([?TMP_DIR,"dest","file1"]))),
?_assertNot(filelib:is_file(filename:join([?TMP_DIR,"source","file1"])))]}. ?_assertNot(filelib:is_regular(filename:join([?TMP_DIR,"source","file1"])))]}.
%% ==================================================================== %% ====================================================================
%% Utilities %% Utilities
@ -266,12 +266,12 @@ teardown(_) ->
%% ==================================================================== %% ====================================================================
assert_files_in(Name, [File|T]) -> assert_files_in(Name, [File|T]) ->
[{Name ++ " has file: " ++ File, ?_assert(filelib:is_file(File))} | [{Name ++ " has file: " ++ File, ?_assert(filelib:is_regular(File))} |
assert_files_in(Name, T)]; assert_files_in(Name, T)];
assert_files_in(_, []) -> []. assert_files_in(_, []) -> [].
assert_files_not_in(Name, [File|T]) -> assert_files_not_in(Name, [File|T]) ->
[{Name ++ " does not have file: " ++ File, [{Name ++ " does not have file: " ++ File,
?_assertNot(filelib:is_file(File))} | ?_assertNot(filelib:is_regular(File))} |
assert_files_not_in(Name, T)]; assert_files_not_in(Name, T)];
assert_files_not_in(_, []) -> []. assert_files_not_in(_, []) -> [].