aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorZandra <[email protected]>2016-05-30 10:56:16 +0200
committerZandra Hird <[email protected]>2016-06-07 14:33:38 +0200
commit6e533ab3a321031b30c3b9ef78e4b4d4878652e9 (patch)
treedc5e3c604bd5cabf6416e92c7a10cfc68752fdbc /lib/common_test
parent2aff0f457896afda2c897996b49abb949300b994 (diff)
downloadotp-6e533ab3a321031b30c3b9ef78e4b4d4878652e9.tar.gz
otp-6e533ab3a321031b30c3b9ef78e4b4d4878652e9.tar.bz2
otp-6e533ab3a321031b30c3b9ef78e4b4d4878652e9.zip
ct_groups: Fix unmatched_return warnings
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/src/ct_groups.erl16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index dd04c5410a..1375e7dcc7 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -402,12 +402,7 @@ expand(Mod, Name, Defs) ->
end.
make_all_conf(Dir, Mod, Props, TestSpec) ->
- case code:is_loaded(Mod) of
- false ->
- code:load_abs(filename:join(Dir,atom_to_list(Mod)));
- _ ->
- ok
- end,
+ _ = load_abs(Dir, Mod),
make_all_conf(Mod, Props, TestSpec).
make_all_conf(Mod, Props, TestSpec) ->
@@ -428,16 +423,19 @@ make_all_conf(Mod, Props, TestSpec) ->
end.
make_conf(Dir, Mod, Name, Props, TestSpec) ->
+ _ = load_abs(Dir, Mod),
+ make_conf(Mod, Name, Props, TestSpec).
+
+load_abs(Dir, Mod) ->
case code:is_loaded(Mod) of
false ->
code:load_abs(filename:join(Dir,atom_to_list(Mod)));
_ ->
ok
- end,
- make_conf(Mod, Name, Props, TestSpec).
+ end.
make_conf(Mod, Name, Props, TestSpec) ->
- case code:is_loaded(Mod) of
+ _ = case code:is_loaded(Mod) of
false ->
code:load_file(Mod);
_ ->