aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
committerHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
commitec36499d7e329b4dc69a1a3be3422eac7907c260 (patch)
tree3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/test_server
parent532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff)
parent53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff)
downloadotp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.bz2
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.zip
Merge branch 'dev' into major
Conflicts: erts/aclocal.m4 erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/test_server_ctrl.erl4
-rw-r--r--lib/test_server/src/ts.config2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index de9b962dfc..f3445b742b 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -4674,13 +4674,13 @@ collect_subcases(Mod, Case, MFA, St, Suite) ->
[] when Case == all -> {ok,[],St};
[] when element(1, Case) == conf -> {ok,[],St};
[] -> {ok,[MFA],St};
-%%%! --- START Kept for backwards compatibilty ---
+%%%! --- START Kept for backwards compatibility ---
%%%! Requirements are not used
{req,ReqList} ->
collect_case_deny(Mod, Case, MFA, ReqList, [], St);
{req,ReqList,SubCases} ->
collect_case_deny(Mod, Case, MFA, ReqList, SubCases, St);
-%%%! --- END Kept for backwards compatibilty ---
+%%%! --- END Kept for backwards compatibility ---
{Skip,Reason} when Skip==skip; Skip==skipped ->
{ok,[{skip_case,{MFA,Reason}}],St};
{error,Reason} ->
diff --git a/lib/test_server/src/ts.config b/lib/test_server/src/ts.config
index f021f5958b..cf3d269616 100644
--- a/lib/test_server/src/ts.config
+++ b/lib/test_server/src/ts.config
@@ -12,7 +12,7 @@
% "10.10.0.1", %IP string
% {10,10,0,1}, %IP tuple
% ["my_ip4_host"], %Any aliases
-% "::ffff:10.10.0.1", %IPv6 string (compatibilty addr)
+% "::ffff:10.10.0.1", %IPv6 string (compatibility addr)
% {0,0,0,0,0,65535,2570,1} %IPv6 tuple
% }}.