diff options
| author | Peter Andersson <[email protected]> | 2012-10-19 17:22:07 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-11-19 11:14:45 +0100 |
| commit | 4a0600126b78a7083cb380c5d9efcdd364f551f8 (patch) | |
| tree | 7942d116261b89aedc564d44a1ca83040e32e590 /lib/common_test/src/ct_run.erl | |
| parent | 41d6a59fb11c65da9edcf97551b19cbdbf00646f (diff) | |
| download | otp-4a0600126b78a7083cb380c5d9efcdd364f551f8.tar.gz otp-4a0600126b78a7083cb380c5d9efcdd364f551f8.tar.bz2 otp-4a0600126b78a7083cb380c5d9efcdd364f551f8.zip | |
Fix problem with config start option not accepting list of files
OTP-10495
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 3383244bf4..ffa2a21ea9 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -2786,8 +2786,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) -> |