aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/test/test_server_SUITE.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-04-04 15:43:06 +0200
committerSiri Hansen <[email protected]>2013-04-04 15:43:06 +0200
commita0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5 (patch)
tree2ece9b6846f9b0e33b8c9ca22ec666066e20da9e /lib/test_server/test/test_server_SUITE.erl
parent44a2884a7df320596039b8c8563bf73f9eb5aa6b (diff)
parentb74b21ba20e1e5aab7887891bf6672abb33f71fc (diff)
downloadotp-a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5.tar.gz
otp-a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5.tar.bz2
otp-a0fb34b3e6a73178e9b4c41ab2a20b3ba1762cd5.zip
Merge branch 'maint'
Diffstat (limited to 'lib/test_server/test/test_server_SUITE.erl')
-rw-r--r--lib/test_server/test/test_server_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 1a2fc632da..cf1df6df34 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -104,7 +104,7 @@ test_server_SUITE(Config) ->
% rpc:call(Node,dbg, tpl,[test_server_ctrl,x]),
run_test_server_tests("test_server_SUITE",
[{test_server_SUITE,skip_case7,"SKIPPED!"}],
- 38, 1, 30, 19, 9, 1, 11, 2, 25, Config).
+ 39, 1, 31, 20, 9, 1, 11, 2, 26, Config).
test_server_parallel01_SUITE(Config) ->
run_test_server_tests("test_server_parallel01_SUITE", [],