aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erix.ericsson.se>2010-12-06 10:55:15 +0100
committerLukas Larsson <lukas@erix.ericsson.se>2011-02-17 17:16:53 +0100
commitd161dc2b44f29f184e60efcd460ed27b1ee0a0e1 (patch)
tree273897a8b38b1cfb07d7833d77f363956e6a524f /erts
parent62e3328272e3bac139e765e6a5147daca02ec833 (diff)
downloadotp-d161dc2b44f29f184e60efcd460ed27b1ee0a0e1.tar.gz
otp-d161dc2b44f29f184e60efcd460ed27b1ee0a0e1.tar.bz2
otp-d161dc2b44f29f184e60efcd460ed27b1ee0a0e1.zip
Update tests to work with ts -> ct migrations script.
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/distribution_SUITE.erl4
-rw-r--r--erts/emulator/test/module_info_SUITE.erl7
2 files changed, 8 insertions, 3 deletions
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index f26455e6da..8213cdcef9 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -267,7 +267,9 @@ local_send_big(doc) ->
["Sends several big message to an non-registered process on ",
"the local node."];
local_send_big(Config) when is_list(Config) ->
- Data0=local_send_big(doc)++local_send(doc),
+ Data0=local_send_big(doc)++
+ ["Tests sending small and big messages to a non-existing ",
+ "local registered process."],
Data1=[Data0,[Data0, Data0, [Data0], Data0],Data0],
Data2=Data0++lists:flatten(Data1)++
list_to_binary(lists:flatten(Data1)),
diff --git a/erts/emulator/test/module_info_SUITE.erl b/erts/emulator/test/module_info_SUITE.erl
index f34a2b496c..17e8462cd3 100644
--- a/erts/emulator/test/module_info_SUITE.erl
+++ b/erts/emulator/test/module_info_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -30,6 +30,9 @@
-export([native_proj/1,native_filter/1]).
all(suite) ->
+ modules().
+
+modules() ->
[exports,functions,native].
init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
@@ -42,7 +45,7 @@ end_per_testcase(_Func, Config) ->
%% Should return all functions exported from this module. (local)
all_exported() ->
- All = add_arity(all(suite)),
+ All = add_arity(modules()),
lists:sort([{all,1},{init_per_testcase,2},{end_per_testcase,2},
{module_info,0},{module_info,1},{native_proj,1},
{native_filter,1}|All]).