aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
diff options
context:
space:
mode:
authorPeter Andersson <peppe@erlang.org>2012-11-20 12:23:40 +0100
committerPeter Andersson <peppe@erlang.org>2012-11-20 12:23:40 +0100
commit3618f75a8816e119a1ed9c7ff71664f0d49f5fb7 (patch)
tree7337f6f14755ff34afdcda07af6a31edde96db49 /lib/common_test/src
parent835404bd9a65b679addb3edf8554a6e2ea77dda4 (diff)
parent8b2dcbaf0acd2350f8b3259701384e6d1a858824 (diff)
downloadotp-3618f75a8816e119a1ed9c7ff71664f0d49f5fb7.tar.gz
otp-3618f75a8816e119a1ed9c7ff71664f0d49f5fb7.tar.bz2
otp-3618f75a8816e119a1ed9c7ff71664f0d49f5fb7.zip
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src')
-rw-r--r--lib/common_test/src/ct_config.erl2
-rw-r--r--lib/common_test/src/ct_run.erl6
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 06a8e12f55..b1d709bc75 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -171,7 +171,7 @@ process_default_configs(Opts) ->
lists:flatmap(fun({config,[_|_] = FileOrFiles}) ->
case {io_lib:printable_list(FileOrFiles),
io_lib:printable_list(hd(FileOrFiles))} of
- {true,true} ->
+ {false,true} ->
FileOrFiles;
{true,false} ->
[FileOrFiles];
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index ed7778c25a..84e410dc03 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -2815,8 +2815,10 @@ opts2args(EnvStartOpts) ->
[{halt_with,[atom_to_list(HaltM),atom_to_list(HaltF)]}];
({interactive_mode,true}) ->
[{shell,[]}];
- ({config,CfgFiles}) ->
- [{ct_config,[CfgFiles]}];
+ ({config,CfgFile}) when is_integer(hd(CfgFile)) ->
+ [{ct_config,[CfgFile]}];
+ ({config,CfgFiles}) when is_list(hd(CfgFiles)) ->
+ [{ct_config,CfgFiles}];
({userconfig,{CBM,CfgStr=[X|_]}}) when is_integer(X) ->
[{userconfig,[atom_to_list(CBM),CfgStr]}];
({userconfig,{CBM,CfgStrs}}) when is_list(CfgStrs) ->