diff options
author | Peter Andersson <[email protected]> | 2012-08-27 12:03:10 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2012-08-27 12:03:10 +0200 |
commit | 5472a54b7f952c08e794eb52175d3724cc2937db (patch) | |
tree | f5902094a99b51c710db28750c9ef61a1563f22c /lib/common_test/src/ct_util.erl | |
parent | 30e714a61860745769f4f2eab0f5cb5e0d4dc947 (diff) | |
parent | 00455b5fec96bf320fc8b3656bb9dbd0395fa23b (diff) | |
download | otp-5472a54b7f952c08e794eb52175d3724cc2937db.tar.gz otp-5472a54b7f952c08e794eb52175d3724cc2937db.tar.bz2 otp-5472a54b7f952c08e794eb52175d3724cc2937db.zip |
Merge remote branch 'origin/peppe/common_test/misc_test_failures' into maint
* origin/peppe/common_test/misc_test_failures:
Solve problem with registering parallel testcases
Diffstat (limited to 'lib/common_test/src/ct_util.erl')
-rw-r--r-- | lib/common_test/src/ct_util.erl | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl index efc85543ac..cf891ed043 100644 --- a/lib/common_test/src/ct_util.erl +++ b/lib/common_test/src/ct_util.erl @@ -39,7 +39,7 @@ delete_suite_data/0, delete_suite_data/1, match_delete_suite_data/1, delete_testdata/0, delete_testdata/1, set_testdata/1, get_testdata/1, get_testdata/2, - set_testdata_async/1, update_testdata/2]). + set_testdata_async/1, update_testdata/2, update_testdata/3]). -export([override_silence_all_connections/0, override_silence_connections/1, get_overridden_silenced_connections/0, @@ -252,7 +252,10 @@ delete_testdata(Key) -> call({delete_testdata, Key}). update_testdata(Key, Fun) -> - call({update_testdata, Key, Fun}). + update_testdata(Key, Fun, []). + +update_testdata(Key, Fun, Opts) -> + call({update_testdata, Key, Fun, Opts}). set_testdata(TestData) -> call({set_testdata, TestData}). @@ -333,7 +336,7 @@ loop(Mode,TestData,StartDir) -> return(From,undefined) end, loop(From,TestData,StartDir); - {{update_testdata,Key,Fun},From} -> + {{update_testdata,Key,Fun,Opts},From} -> TestData1 = case lists:keysearch(Key,1,TestData) of {value,{Key,Val}} -> @@ -341,8 +344,15 @@ loop(Mode,TestData,StartDir) -> return(From,NewVal), [{Key,NewVal}|lists:keydelete(Key,1,TestData)]; _ -> - return(From,undefined), - TestData + case lists:member(create,Opts) of + true -> + InitVal = Fun(undefined), + return(From,InitVal), + [{Key,InitVal}|TestData]; + false -> + return(From,undefined), + TestData + end end, loop(From,TestData1,StartDir); {{set_cwd,Dir},From} -> |