diff options
| author | Lukas Larsson <[email protected]> | 2011-01-13 11:00:44 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-01-24 10:45:15 +0100 |
| commit | b192aefadc64f13fe802dbe78eeb85a2bdba43f3 (patch) | |
| tree | 90303fd8202e412e43a935bcae4956f4e1e58730 /lib/test_server | |
| parent | 64b1a505c46cb51c7ba3f0588a89fb7bc712aa9a (diff) | |
| download | otp-b192aefadc64f13fe802dbe78eeb85a2bdba43f3.tar.gz otp-b192aefadc64f13fe802dbe78eeb85a2bdba43f3.tar.bz2 otp-b192aefadc64f13fe802dbe78eeb85a2bdba43f3.zip | |
Update ts to start common test with both ts.config and ts.PLATFORM.config
Diffstat (limited to 'lib/test_server')
| -rw-r--r-- | lib/test_server/src/ts_run.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl index 557aa0ef3a..68d731925f 100644 --- a/lib/test_server/src/ts_run.erl +++ b/lib/test_server/src/ts_run.erl @@ -411,6 +411,15 @@ write_spec_file(Vars, Spec, _State) -> MoreConfig = io_lib:format("~p.\n", [{config,Conf}]), file:write_file("current.spec", [DiskLess,Hosts,MoreConfig,SpecFile]). +get_config_files() -> + TSConfig = "ts.config", + [TSConfig | case os:type() of + {unix,_} -> ["ts.unix.config"]; + {win32,_} -> ["ts.win32.config"]; + vxworks -> ["ts.vxworks.config"]; + _ -> [] + end]. + consult_config() -> {ok,Conf} = file:consult("ts.config"), case os:type() of @@ -624,7 +633,8 @@ make_common_test_args(Args0, Options, _Vars) -> {value, {config, _}} -> []; false -> - [{config, "../test_server/ts.config"}] + [{config, [filename:join("../test_server",File) + || File <- get_config_files()]}] end, io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++ConfigFile++Options]). |