diff options
| author | Peter Andersson <[email protected]> | 2012-03-20 09:37:48 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-20 09:37:48 +0100 |
| commit | ffdbabc66baef68713aca61f41bee57a39d77c36 (patch) | |
| tree | 47f05452d539c31b498d2cc30b42c6bb45282558 /lib/common_test/src/ct_run.erl | |
| parent | dade65ef6622f532cad64a9cecaae747249f7f3d (diff) | |
| parent | f16576b473d4f514197d6262e7a4c4a23c00d9e5 (diff) | |
| download | otp-ffdbabc66baef68713aca61f41bee57a39d77c36.tar.gz otp-ffdbabc66baef68713aca61f41bee57a39d77c36.tar.bz2 otp-ffdbabc66baef68713aca61f41bee57a39d77c36.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl index 666eb3c988..72124f6f21 100644 --- a/lib/common_test/src/ct_run.erl +++ b/lib/common_test/src/ct_run.erl @@ -1413,7 +1413,8 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) -> %% which framework it runs under. case os:getenv("TEST_SERVER_FRAMEWORK") of false -> - os:putenv("TEST_SERVER_FRAMEWORK", "ct_framework"); + os:putenv("TEST_SERVER_FRAMEWORK", "ct_framework"), + os:putenv("TEST_SERVER_FRAMEWORK_NAME", "common_test"); "ct_framework" -> ok; Other -> @@ -2328,7 +2329,7 @@ ct_hooks_args2opts(Args) -> Acc end,[],Args). -ct_hooks_args2opts([CTH,Arg,Prio,"and"| Rest],Acc) -> +ct_hooks_args2opts([CTH,Arg,Prio,"and"| Rest],Acc) when Arg /= "and" -> ct_hooks_args2opts(Rest,[{list_to_atom(CTH), parse_cth_args(Arg), parse_cth_args(Prio)}|Acc]); |