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
errord · Nov 16, 2011 · 123b82c · 123b82c
2 parents 4f87245 + ec31c8e
commit 123b82c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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),