diff options
| author | Zandra Hird <[email protected]> | 2016-06-09 14:40:22 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2016-06-09 14:40:22 +0200 |
| commit | 75e5cdabbcaaa12f043225ca8d361055a9d47b24 (patch) | |
| tree | 6c3abd0e228d33dcd7f40d909fda885fea2b8738 /lib/common_test/src/ct_groups.erl | |
| parent | 6a47b7c2c6cd467257e0bc65b8a0fa8ecd74cc13 (diff) | |
| parent | 02564a09a8df4cd0cd8e6e53b7e3a3107e3229d7 (diff) | |
| download | otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.tar.gz otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.tar.bz2 otp-75e5cdabbcaaa12f043225ca8d361055a9d47b24.zip | |
Merge branch 'zandra/common_test/unmatched_returns/OTP-13345'
* zandra/common_test/unmatched_returns/OTP-13345: (23 commits)
ct logs: Fix unmatched_return warnings
ct_util: Fix unmatched_return warnings
erl2html2: Fix unmatched_return warnings
cth_conn_log: Fix unmatched_return warnings
ct_webtool: Fix unmatched_return warnings
ct_telnet: Fix unmatched_return warnings
ct_ssh: Fix unmatched_return warnings
ct_snmp: Fix unmatched_return warnings
ct_slave: Fix unmatched_return warnings
ct_rpc: Fix unmatched_return warnings
ct_repeat: Fix unmatched_return warnings
ct_release_test: Fix unmatched_return warnings
ct_property_test: Fix unmatched_return warnings
ct_master: Fix unmatched_return warnings
ct_hooks_lock: Fix unmatched_return warnings
ct_hooks: Fix unmatched_return warnings
ct_groups: Fix unmatched_return warnings
ct_ftp: Fix unmatched_return warnings
ct_framework: Fix unmatched_return warnings
ct_config: Fix unmatched_return warnings
...
Diffstat (limited to 'lib/common_test/src/ct_groups.erl')
| -rw-r--r-- | lib/common_test/src/ct_groups.erl | 16 |
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); _ -> |