diff options
author | Peter Andersson <[email protected]> | 2012-03-15 16:37:55 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-03-15 16:38:09 +0100 |
commit | 1748c9e027594c011a08feb16c7f94fe62ead2a4 (patch) | |
tree | ac6e0365435de0a23ee1e89a37f084457a1bc6d9 /lib/common_test/src/ct_testspec.erl | |
parent | 7484721f847e95380e66456b4a55e08481b570d8 (diff) | |
parent | ccdee0c96757252c63f4e4d2f3d21c628e0c4025 (diff) | |
download | otp-1748c9e027594c011a08feb16c7f94fe62ead2a4.tar.gz otp-1748c9e027594c011a08feb16c7f94fe62ead2a4.tar.bz2 otp-1748c9e027594c011a08feb16c7f94fe62ead2a4.zip |
Merge remote branch 'origin/peppe/common_test/otp-9634_9659' into maint
* origin/peppe/common_test/otp-9634_9659:
Change the option name 'unique_priv_dir' to 'create_priv_dir'
Add test suite for the unique_priv_dir feature
Make it possible to use unique priv_dir names
Create entry for every repeated test in index.html
OTP-9634
OTP-9659
Diffstat (limited to 'lib/common_test/src/ct_testspec.erl')
-rw-r--r-- | lib/common_test/src/ct_testspec.erl | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl index b68cbd3aa1..5b197c0c81 100644 --- a/lib/common_test/src/ct_testspec.erl +++ b/lib/common_test/src/ct_testspec.erl @@ -568,6 +568,21 @@ add_tests([{scale_timetraps,Node,ST}|Ts],Spec) -> add_tests([{scale_timetraps,ST}|Ts],Spec) -> add_tests([{scale_timetraps,all_nodes,ST}|Ts],Spec); +%% --- create_priv_dir --- +add_tests([{create_priv_dir,all_nodes,PD}|Ts],Spec) -> + Tests = lists:map(fun(N) -> {create_priv_dir,N,PD} end, list_nodes(Spec)), + add_tests(Tests++Ts,Spec); +add_tests([{create_priv_dir,Nodes,PD}|Ts],Spec) when is_list(Nodes) -> + Ts1 = separate(Nodes,create_priv_dir,[PD],Ts,Spec#testspec.nodes), + add_tests(Ts1,Spec); +add_tests([{create_priv_dir,Node,PD}|Ts],Spec) -> + PDs = Spec#testspec.create_priv_dir, + PDs1 = [{ref2node(Node,Spec#testspec.nodes),PD} | + lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,PDs)], + add_tests(Ts,Spec#testspec{create_priv_dir=PDs1}); +add_tests([{create_priv_dir,PD}|Ts],Spec) -> + add_tests([{create_priv_dir,all_nodes,PD}|Ts],Spec); + %% --- config --- add_tests([{config,all_nodes,Files}|Ts],Spec) -> Tests = lists:map(fun(N) -> {config,N,Files} end, list_nodes(Spec)), @@ -1158,7 +1173,8 @@ valid_terms() -> {skip_groups,6}, {skip_groups,7}, {skip_cases,5}, - {skip_cases,6} + {skip_cases,6}, + {create_priv_dir,2} ]. %% this function "guesses" if the user has misspelled a term name |