diff options
| author | Peter Andersson <[email protected]> | 2011-04-28 22:49:06 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-04-28 22:49:18 +0200 |
| commit | 9051df48646573dbb740b16396bf9b55be288525 (patch) | |
| tree | b53b8fb8fefecabacbc4eb75a3c6132f1795b365 /lib/test_server/src/ts_run.erl | |
| parent | 3e815447cafbcb704bac1fac3d195e94def7080f (diff) | |
| parent | b2591419882ee3b070c5da532597efc15d3a0535 (diff) | |
| download | otp-9051df48646573dbb740b16396bf9b55be288525.tar.gz otp-9051df48646573dbb740b16396bf9b55be288525.tar.bz2 otp-9051df48646573dbb740b16396bf9b55be288525.zip | |
Merge branch 'peppe/common_test/r14b03_tickets' into dev
* peppe/common_test/r14b03_tickets:
Have test_server locate the source code file for a test suite module if it's not in the same directory as the beam file.
Fix error in vts mode, making it impossible to execute suites with test case groups.
Fix problem with merging ticket branch.
Fix problems with timetrap handling in common_test: 1. ct:timetrap(infinity) not supported. 2. Previous set timetrap for a test case is not cancelled by new one.
Document the new init_per_testcase return value.
Make it possible to fail test case by returning {fail,Reason} from init_per_testcase.
Fix problem with merging a ticket branch.
Fix issues related to test case groups: 1. Allow empty group to be specified without generating an error. 2. Sort out potential problem with unnecessary call to delete_subs/2.
Add test case for suite with empty group.
Improve validation of test events.
Fix failing tests on Windows.
Make it possible to refresh the top level index page at the start of a test run.
Fix problem with CT hook start error causing IO to be sent to wrong group leader process.
Do minor updates of the ts test framework.
Correct failing test cases.
OTP-9233
OTP-9210
OTP-9195
OTP-9161
OTP-9160
OTP-9159
OTP-9138
Diffstat (limited to 'lib/test_server/src/ts_run.erl')
| -rw-r--r-- | lib/test_server/src/ts_run.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl index 067961a216..d145290820 100644 --- a/lib/test_server/src/ts_run.erl +++ b/lib/test_server/src/ts_run.erl @@ -212,6 +212,12 @@ make_command(Vars, Spec, State) -> false -> ok end, + + %% If Common Test specific variables are needed, add them here + %% on form: "{key1,value1}" "{key2,value2}" ... + NetDir = ts_lib:var(ts_net_dir, Vars), + TestVars = [ "\"{net_dir,\\\"",NetDir,"\\\"}\"" ], + %% NOTE: Do not use ' in these commands as it wont work on windows Cmd = [Erl, Naming, "test_server" " -rsh ", ts_lib:var(rsh_name, Vars), @@ -224,6 +230,7 @@ make_command(Vars, Spec, State) -> %% " -test_server_format_exception false", " -boot start_sasl -sasl errlog_type error", " -pz ",Cwd, + " -ct_test_vars ",TestVars, " -eval \"file:set_cwd(\\\"",TestDir,"\\\")\" " " -eval \"ct:run_test(", backslashify(lists:flatten(State#state.test_server_args)),")\"" @@ -369,7 +376,6 @@ make_common_test_args(Args0, Options, _Vars) -> end, ConfigFiles = [{config,[filename:join(ConfigPath,File) || File <- get_config_files()]}], - io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++ ConfigFiles++Options]). |