diff options
author | Tristan Sloughter <[email protected]> | 2015-06-21 10:22:02 -0500 |
---|---|---|
committer | Tristan Sloughter <[email protected]> | 2015-06-21 10:22:02 -0500 |
commit | 4f38907d4967d672d3a2b13422cde2e13a42a604 (patch) | |
tree | fd6eb5fb93acd86c9dca01c9ffbdd029e4169b87 /test/rlx_release_SUITE.erl | |
parent | 87e87154fa52f815404e25d1ef59179253f9c5bb (diff) | |
parent | 04a945375a63542811d3af7bd14bc7d5c5b303d9 (diff) | |
download | relx-4f38907d4967d672d3a2b13422cde2e13a42a604.tar.gz relx-4f38907d4967d672d3a2b13422cde2e13a42a604.tar.bz2 relx-4f38907d4967d672d3a2b13422cde2e13a42a604.zip |
Merge pull request #349 from Taure/windows-fix
Fixing test for windows, changing symlink to symlink_or_copy
Diffstat (limited to 'test/rlx_release_SUITE.erl')
-rw-r--r-- | test/rlx_release_SUITE.erl | 58 |
1 files changed, 42 insertions, 16 deletions
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), |