diff options
| author | Lukas Larsson <[email protected]> | 2011-02-16 09:48:56 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-16 09:49:40 +0100 |
| commit | 00db7dddae0c6f1acddf52d97c9e6c65393d2459 (patch) | |
| tree | 58c8c5b8cd4b81c6a8788bf80fa9808be59f7bb1 /lib/test_server/src/ts_run.erl | |
| parent | 8b86cd551352ac06bccbeab4c76849d3978876ec (diff) | |
| download | otp-00db7dddae0c6f1acddf52d97c9e6c65393d2459.tar.gz otp-00db7dddae0c6f1acddf52d97c9e6c65393d2459.tar.bz2 otp-00db7dddae0c6f1acddf52d97c9e6c65393d2459.zip | |
Update ts to take the config path as an invironmental and as a variables passed with all_tests and also with the normal run
Diffstat (limited to 'lib/test_server/src/ts_run.erl')
| -rw-r--r-- | lib/test_server/src/ts_run.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl index d1e0e2e99c..60e01600e1 100644 --- a/lib/test_server/src/ts_run.erl +++ b/lib/test_server/src/ts_run.erl @@ -632,15 +632,20 @@ make_common_test_args(Args0, Options, _Vars) -> [{logdir,"../test_server"}] end, - ConfigFile = case lists:keysearch(config, 1, Options) of - {value, {config, _}} -> - []; - false -> - [{config, [filename:join("../test_server",File) - || File <- get_config_files()]}] + ConfigPath = case {os:getenv("TEST_CONFIG_PATH"), + lists:keysearch(config, 1, Options)} of + {false,{value, {config, Path}}} -> + Path; + {false,false} -> + "../test_server"; + {Path,_} -> + Path end, + ConfigFiles = [{config,[filename:join(ConfigPath,File) + || File <- get_config_files()]}], - io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++ConfigFile++Options]). + io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++ + ConfigFiles++Options]). make_test_server_args(Args0,Options,Vars) -> Parameters = |