From 04a945375a63542811d3af7bd14bc7d5c5b303d9 Mon Sep 17 00:00:00 2001 From: Daniel Widgren Date: Thu, 11 Jun 2015 14:44:44 +0200 Subject: Fixing test for windows, changing symlink to symlink_or_copy --- test/rlx_command_SUITE.erl | 3 ++- test/rlx_release_SUITE.erl | 58 +++++++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 17 deletions(-) (limited to 'test') diff --git a/test/rlx_command_SUITE.erl b/test/rlx_command_SUITE.erl index db2794d..9d1513f 100644 --- a/test/rlx_command_SUITE.erl +++ b/test/rlx_command_SUITE.erl @@ -63,7 +63,8 @@ normal_passing_case(Config) -> {ok, State} = rlx_cmd_args:args2state(Opts, Targets), {ok, State1} = rlx_config:do(State), Overrides = rlx_state:overrides(State1), - ?assertMatch([{lib1, Lib1}], Overrides), + ct:pal("Overrides: ~p~n", [Overrides]), + ?assertMatch([{lib1,Lib1}], Overrides), ?assertMatch([Lib1, Lib2], rlx_state:lib_dirs(State1)), ?assertMatch(Outdir, rlx_state:base_output_dir(State1)), diff --git a/test/rlx_release_SUITE.erl b/test/rlx_release_SUITE.erl index 9b09ab9..cf98822 100644 --- a/test/rlx_release_SUITE.erl +++ b/test/rlx_release_SUITE.erl @@ -281,9 +281,15 @@ make_overridden_release(Config) -> ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), ?assert(lists:member({OverrideAppName, OverrideVsn}, AppSpecs)), ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)), - {ok, Real} = file:read_link(filename:join([OutputDir, "foo", "lib", - OverrideApp ++ "-" ++ OverrideVsn])), - ?assertMatch(OverrideAppDir, Real). + case os:type() of + {win32, _} -> + filelib:is_file(filename:join([OutputDir, "foo", "lib", + OverrideApp ++ "-" ++ OverrideVsn])); + _ -> + {ok, Real} = file:read_link(filename:join([OutputDir, "foo", "lib", + OverrideApp ++ "-" ++ OverrideVsn])), + ?assertMatch(OverrideAppDir, Real) + end. make_skip_app_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), @@ -493,9 +499,15 @@ make_rerun_overridden_release(Config) -> ?assert(lists:member({goal_app_2, "0.0.1"}, AppSpecs)), ?assert(lists:member({OverrideAppName, OverrideVsn}, AppSpecs)), ?assert(lists:member({lib_dep_1, "0.0.1", load}, AppSpecs)), - {ok, Real} = file:read_link(filename:join([OutputDir, "foo", "lib", - OverrideApp ++ "-" ++ OverrideVsn])), - ?assertMatch(OverrideAppDir, Real). + case os:type() of + {win32, _} -> + filelib:is_file(filename:join([OutputDir, "foo", "lib", + OverrideApp ++ "-" ++ OverrideVsn])); + _ -> + {ok, Real} = file:read_link(filename:join([OutputDir, "foo", "lib", + OverrideApp ++ "-" ++ OverrideVsn])), + ?assertMatch(OverrideAppDir, Real) + end. overlay_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), @@ -845,16 +857,30 @@ make_dev_mode_release(Config) -> {ok, State} = relx:do(undefined, undefined, [], [LibDir1], 3, OutputDir, ConfigFile), [{{foo, "0.0.1"}, _Release}] = ec_dictionary:to_list(rlx_state:realized_releases(State)), - - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "non_goal_1-0.0.1"]))), - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "non_goal_2-0.0.1"]))), - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "goal_app_1-0.0.1"]))), - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "goal_app_2-0.0.1"]))), - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "lib_dep_1-0.0.1"]))), - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "releases", "0.0.1", - "sys.config"]))), - ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "releases", "0.0.1", - "vm.args"]))). + + + case os:type() of + {unix, _} -> + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "non_goal_1-0.0.1"]))), + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "non_goal_2-0.0.1"]))), + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "goal_app_1-0.0.1"]))), + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "goal_app_2-0.0.1"]))), + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "lib", "lib_dep_1-0.0.1"]))), + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "releases", "0.0.1", + "sys.config"]))), + ?assert(ec_file:is_symlink(filename:join([OutputDir, "foo", "releases", "0.0.1", + "vm.args"]))); + {win32, _} -> + ?assert(filelib:is_dir(filename:join([OutputDir, "foo", "lib", "non_goal_1-0.0.1"]))), + ?assert(filelib:is_dir(filename:join([OutputDir, "foo", "lib", "non_goal_2-0.0.1"]))), + ?assert(filelib:is_dir(filename:join([OutputDir, "foo", "lib", "goal_app_1-0.0.1"]))), + ?assert(filelib:is_dir(filename:join([OutputDir, "foo", "lib", "goal_app_2-0.0.1"]))), + ?assert(filelib:is_dir(filename:join([OutputDir, "foo", "lib", "lib_dep_1-0.0.1"]))), + ?assert(filelib:is_file(filename:join([OutputDir, "foo", "releases", "0.0.1", + "sys.config"]))), + ?assert(filelib:is_file(filename:join([OutputDir, "foo", "releases", "0.0.1", + "vm.args"]))) + end. make_config_script_release(Config) -> LibDir1 = proplists:get_value(lib1, Config), -- cgit v1.2.3