aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-03-18 15:06:42 +0100
committerLukas Larsson <[email protected]>2019-03-25 16:34:11 +0100
commit5f495e6b91bcc3e09ee343a2e9b4e1f7de11fa7a (patch)
treece464f8ae2346b986fea00c67dca2ce5691b9693 /erts
parent3379747ece9a9d87ddb29dff5bf2a9b6e9b1cd9d (diff)
downloadotp-5f495e6b91bcc3e09ee343a2e9b4e1f7de11fa7a.tar.gz
otp-5f495e6b91bcc3e09ee343a2e9b4e1f7de11fa7a.tar.bz2
otp-5f495e6b91bcc3e09ee343a2e9b4e1f7de11fa7a.zip
Revert "erts: Always run fds check after each testcase"
This reverts commit 1eb0a2c47edd036731ee1e4e4f7b5bdfc7d576fa.
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/Makefile3
-rw-r--r--erts/emulator/test/bs_construct_SUITE.erl1
-rw-r--r--erts/emulator/test/driver_SUITE.erl3
-rw-r--r--erts/emulator/test/emulator.spec1
-rw-r--r--erts/emulator/test/erts_test_utils.erl77
5 files changed, 1 insertions, 84 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index e69120bf13..8c2054cb51 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -248,13 +248,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
release_spec:
-release_tests_spec: tests
+release_tests_spec: make_emakefile
$(INSTALL_DIR) "$(RELSYSDIR)"
$(INSTALL_DATA) $(EMAKEFILE) $(TEST_SPEC_FILES) \
$(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
$(INSTALL_DATA) $(NO_OPT_ERL_FILES) "$(RELSYSDIR)"
$(INSTALL_DATA) $(NATIVE_ERL_FILES) "$(RELSYSDIR)"
- $(INSTALL_DATA) *.beam "$(RELSYSDIR)"
chmod -R u+w "$(RELSYSDIR)"
tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
index a20592dadd..ad05cb3689 100644
--- a/erts/emulator/test/bs_construct_SUITE.erl
+++ b/erts/emulator/test/bs_construct_SUITE.erl
@@ -45,7 +45,6 @@ all() ->
bad_append, bs_add_overflow].
init_per_suite(Config) ->
- application:ensure_all_started(os_mon),
Config.
end_per_suite(_Config) ->
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 381c284bde..bb0f3498ab 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -88,9 +88,6 @@
-export([get_check_io_total/1]). % for z_SUITE.erl
--compile(export_all).
-
-
-include_lib("common_test/include/ct.hrl").
diff --git a/erts/emulator/test/emulator.spec b/erts/emulator/test/emulator.spec
index 4b1fec0bab..7a6dd83020 100644
--- a/erts/emulator/test/emulator.spec
+++ b/erts/emulator/test/emulator.spec
@@ -1,3 +1,2 @@
{enable_builtin_hooks, false}.
-{ct_hooks, [erts_test_utils]}.
{suites,"../emulator_test",all}.
diff --git a/erts/emulator/test/erts_test_utils.erl b/erts/emulator/test/erts_test_utils.erl
index 83bd3dadca..e4e00a0a16 100644
--- a/erts/emulator/test/erts_test_utils.erl
+++ b/erts/emulator/test/erts_test_utils.erl
@@ -31,83 +31,6 @@
available_internal_state/1,
check_node_dist/0, check_node_dist/1, check_node_dist/3]).
-%% Suite Callbacks
--export([id/1]).
--export([init/2]).
-
--export([pre_init_per_testcase/3]).
--export([post_end_per_testcase/4]).
-
--include_lib("kernel/include/file.hrl").
-
--type config() :: proplists:proplist().
--type reason() :: term().
--type skip_or_fail() :: {skip, reason()} |
- {auto_skip, reason()} |
- {fail, reason()}.
-
--record(state, { ts_conf_dir, target_system, install_opts, nodenames, nodes }).
-
-%% The id of this SCB
--spec id(Opts :: term()) ->
- Id :: term().
-id(_Opts) ->
- ?MODULE.
-
-%% Always called before any other callback function.
--spec init(Id :: term(), Opts :: proplists:proplist()) ->
- {ok, State :: #state{}}.
-init(_Id, Opts) ->
- {ok, []}.
-
-%% Called before each test case.
--spec pre_init_per_testcase(TC :: atom(),
- Config :: config(),
- State :: #state{}) ->
- {config() | skip_or_fail(), NewState :: #state{}}.
-pre_init_per_testcase(_TC,Config,State) ->
- Before = available_internal_state(true),
- CIOD = erts_debug:get_internal_state(check_io_debug),
- available_internal_state(Before),
- CIO = driver_SUITE:get_stable_check_io_info(),
- 0 = element(1, CIOD),
- ct:log("~s~n~n~s",[os:cmd("ls -la /proc/"++ os:getpid() ++"/fd/*"),
- os:cmd("cat /proc/"++ os:getpid() ++"/fdinfo/*")]),
- {Config, {CIO, CIOD}}.
-
--spec post_end_per_testcase(TC :: atom(),
- Config :: config(),
- Return :: term(),
- State :: #state{}) ->
- {ok | skip_or_fail(), NewState :: #state{}}.
-post_end_per_testcase(_TC,_Config,Return,St) ->
- {links, Links} = erlang:process_info(self(), links),
- ToKill = [Pid || Pid <- Links,
- try
- is_port(Pid) orelse
- begin
- {_, Dict} = erlang:process_info(Pid,dictionary),
- proplists:get_value(ct_process_type,Dict) /= system
- end
- catch _:_ ->
- false
- end],
- ct:pal("Links To Kill: ~p", [ToKill]),
- [ catch unlink(Pid) || Pid <- ToKill],
- [ catch exit(Pid, die) || Pid <- ToKill],
- timer:sleep(2000),
- Before = available_internal_state(true),
- AfterCIOD = erts_debug:get_internal_state(check_io_debug),
- available_internal_state(Before),
- AfterCIO = driver_SUITE:get_stable_check_io_info(),
- case St of
- {CIO, CIOD} ->
- driver_SUITE:verify_chkio_state(CIO, AfterCIO),
- 0 = element(1, CIOD);
- _ ->
- ok
- end,
- {Return, []}.
-define(VERSION_MAGIC, 131).