Fix problem with config start option not accepting list of files

OTP-10495
howard0su · Nov 19, 2012 · 4a06001 · 4a06001
1 parent 41d6a59
commit 4a06001
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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) ->

diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
@@ -88,8 +88,8 @@ require(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     run_test(config_static_SUITE,
 	     Config,
-	     [{config, filename:join(DataDir, "config/shadow.txt")},
-	      {config, filename:join(DataDir, "config/config.txt")}],
+	     [{config, [filename:join(DataDir, "config/shadow.txt"),
+			filename:join(DataDir, "config/config.txt")]}],
              ["config_static_SUITE"]).
 
 install_config(Config) when is_list(Config) ->
@@ -174,6 +174,7 @@ run_test(Name, Config, CTConfig, SuiteNames)->
     Joiner = fun(Suite) -> filename:join(DataDir, "config/test/"++Suite) end,
     Suites = lists:map(Joiner, SuiteNames),
     {Opts,ERPid} = setup_env({suite,Suites}, Config, CTConfig),
+
     ok = ct_test_support:run(Opts, Config),
     TestEvents = ct_test_support:get_events(ERPid, Config),
     ct_test_support:log_events(Name,