diff options
| author | Anders Svensson <[email protected]> | 2011-11-16 17:01:11 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-11-16 17:01:11 +0100 |
| commit | 123b82c8ab247213d5214111db645208262d5c42 (patch) | |
| tree | 5645beab729591b7fbc89d23af6cd8dabd052a44 | |
| parent | 4f872459b0a5b5f15273456ec0266a07f52fc5ac (diff) | |
| parent | ec31c8ea920d9f689ae775839ee9f8ec36e43570 (diff) | |
| download | otp-123b82c8ab247213d5214111db645208262d5c42.tar.gz otp-123b82c8ab247213d5214111db645208262d5c42.tar.bz2 otp-123b82c8ab247213d5214111db645208262d5c42.zip | |
Merge branch 'anders/diameter/app_suite_vs_sasl/OTP-9704'
* anders/diameter/app_suite_vs_sasl/OTP-9704:
Add sasl to app testcases to placate systools
| -rw-r--r-- | lib/diameter/test/diameter_app_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl index d5ecdea291..241eb41821 100644 --- a/lib/diameter/test/diameter_app_SUITE.erl +++ b/lib/diameter/test/diameter_app_SUITE.erl @@ -134,13 +134,16 @@ release(Config) -> Rel = {release, {"diameter test release", fetch(vsn, App)}, {erts, erlang:system_info(version)}, - [{A, appvsn(A)} || A <- fetch(applications, App)]}, + [{A, appvsn(A)} || A <- [sasl | fetch(applications, App)]]}, Dir = fetch(priv_dir, Config), ok = write_file(filename:join([Dir, "diameter_test.rel"]), Rel), {ok, _, []} = systools:make_script("diameter_test", [{path, [Dir]}, {outdir, Dir}, silent]). +%% sasl need to be included to avoid a missing_sasl warning, error +%% in the case of relup/1. + appvsn(Name) -> [{application, Name, App}] = diameter_util:consult(Name, app), fetch(vsn, App). @@ -208,7 +211,7 @@ relup(Config) -> App = fetch(app, Config), Rel = [{erts, erlang:system_info(version)} - | [{A, appvsn(A)} || A <- fetch(applications, App)]], + | [{A, appvsn(A)} || A <- [sasl | fetch(applications, App)]]], Dir = fetch(priv_dir, Config), |