Merge branch 'lukas/converted_test_suites/OTP-8768' into dev

* lukas/converted_test_suites/OTP-8768: (102 commits)
  Update ipv6 testcase to be skipped if no ipv6 hosts are defined
  Update ftp suite to take config from ct:get_config
  Update gethostname test cases for v6 to use the v6 hosts instead of v4
  Rename Suite Callback to Common Test Hook
  Strip ts.config of internal addresses.
  Update ssl orber tests to be skipped if there is no ssl installed
  Update init_per_suite to skip all tests if crypto does not exist
  Update so that count_children_memory is skipped on +Meamin emulators
  Update so that tests are skipped if odbc:connect fails
  Update end_per_suite so that it does not crash on non-smp emulators
  Update init_per_testcase to kill all slaves when called. This is to prevent testcases which fail to before to chain with the ones run after.
  Update and add cover spec files to work with common_test
  Update all test specs
  Fix formatting for emulator
  Fix formatting for epmd
  Fix formatting for system
  Fix formatting for wx
  Fix formatting for tools
  Fix formatting for syntax_tools
  Fix formatting for stdlib
  ...

5 files changed, 25 insertions, 17 deletions

diff --git a/lib/et/test/Makefile b/lib/et/test/Makefile
index 7227ae8fd8..2125f9622a 100644
--- a/lib/et/test/Makefile
+++ b/lib/et/test/Makefile
@@ -71,7 +71,7 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) et.spec $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) et.spec et.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
 	$(INSTALL_SCRIPT) ett $(RELSYSDIR)
 	$(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR)
 #	chmod -f -R u+w $(RELSYSDIR)
diff --git a/lib/et/test/et.cover b/lib/et/test/et.cover
new file mode 100644
index 0000000000..471e6d985d
--- /dev/null
+++ b/lib/et/test/et.cover
@@ -0,0 +1,2 @@
+{incl_app,et,details}.
+
diff --git a/lib/et/test/et.spec b/lib/et/test/et.spec
index 69cd8d7582..09993a217a 100644
--- a/lib/et/test/et.spec
+++ b/lib/et/test/et.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../et_test"}}.
-
+{suites,"../et_test",all}.
diff --git a/lib/et/test/et_test_lib.erl b/lib/et/test/et_test_lib.erl
index b91b63786c..c1bfeb9fc0 100644
--- a/lib/et/test/et_test_lib.erl
+++ b/lib/et/test/et_test_lib.erl
@@ -95,7 +95,7 @@ wx_init_per_suite(Config) ->
 					  exit({skipped, "Can not test on MacOSX"});
 				      {unix, _} ->
 					  io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
-					  case proplists:get_value(xserver, Config, none) of
+					  case ct:get_config(xserver, none) of
 					      none   -> ignore;
 					      Server -> os:putenv("DISPLAY", Server)
 					  end;
@@ -295,7 +295,7 @@ eval_test_case(Mod, Fun, Config) ->
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
     R = apply(Mod, Fun, [NewConfig]),
-    Mod:fin_per_testcase(Fun, NewConfig),
+    Mod:end_per_testcase(Fun, NewConfig),
     exit({test_case_ok, R}).
 
 wait_for_evaluator(Pid, Mod, Fun, Config) ->
@@ -311,12 +311,12 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 	{'EXIT', Pid, {skipped, Reason}} ->
 	    log("<WARNING> Test case ~w skipped, because ~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {skip, {Mod, Fun}, Reason};
 	{'EXIT', Pid, Reason} ->
 	    log("<ERROR> Eval process ~w exited, because\n\t~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {crash, {Mod, Fun}, Reason}
     end.
 
diff --git a/lib/et/test/et_wx_SUITE.erl b/lib/et/test/et_wx_SUITE.erl
index 1a16ca69a3..6109ed4e04 100644
--- a/lib/et/test/et_wx_SUITE.erl
+++ b/lib/et/test/et_wx_SUITE.erl
@@ -18,8 +18,9 @@
 
 -module(et_wx_SUITE).
 
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -36,16 +37,22 @@ init_per_testcase(Func,Config) ->
     et_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     et_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    et_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     start_all_windows
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_all_windows].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% The test cases