Major restructure of dialyzer's testsuite

Generation of the PLT is now performed without using OS commands.
We still try to copy in the default plt to make small scale testing
efficient. If generation/checking fails, suites are skipped except
plt_tests_SUITE which contains a bare PLT check that fails normally.

1 files changed, 44 insertions, 53 deletions

diff --git a/lib/dialyzer/test/options2_tests_SUITE.erl b/lib/dialyzer/test/options2_tests_SUITE.erl
index e23ad1f326..43b5207744 100644
--- a/lib/dialyzer/test/options2_tests_SUITE.erl
+++ b/lib/dialyzer/test/options2_tests_SUITE.erl
@@ -1,61 +1,52 @@
--module(options2_tests_SUITE).
-
--include_lib("test_server/include/test_server.hrl").
-
--export([all/0, groups/0, init_per_group/2, end_per_group/2,
-         init_per_testcase/2, fin_per_testcase/2]).
+%% ATTENTION!
+%% This is an automatically generated file. Do not edit.
+%% Use './remake' script to refresh it if needed.
+%% All Dialyzer options should be defined in dialyzer_options
+%% file.
 
--export([kernel/1]).
-
--define(default_timeout, ?t:minutes(1)).
--define(dialyzer_options, ?config(dialyzer_options, Config)).
--define(datadir, ?config(data_dir, Config)).
--define(privdir, ?config(priv_dir, Config)).
+-module(options2_tests_SUITE).
 
-groups() -> [].
+-include("ct.hrl").
+-include("dialyzer_test_constants.hrl").
 
-init_per_group(_GroupName, Config) -> Config.
+-export([suite/0, init_per_suite/0, init_per_suite/1,
+         end_per_suite/1, all/0]).
+-export([options2_tests_SUITE_consistency/1, kernel/1]).
 
-end_per_group(_GroupName, Config) -> Config.
+suite() ->
+  [{timetrap, {minutes, 1}}].
 
-init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{dialyzer_options, [{defines,[{vsn,4}]},{warnings,[no_return]}]}, {watchdog, Dog} | Config].
+init_per_suite() ->
+  [{timetrap, ?plt_timeout}].
+init_per_suite(Config) ->
+  OutDir = ?config(priv_dir, Config),
+  case dialyzer_common:check_plt(OutDir) of
+    fail -> {skip, "Plt creation/check failed."};
+    ok -> [{dialyzer_options, [{defines,[{vsn,4}]},{warnings,[no_return]}]}|Config]
+  end.
 
-fin_per_testcase(_Case, _Config) ->
-    Dog = ?config(watchdog, _Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
+end_per_suite(_Config) ->
+  ok.
 
 all() ->
-    [kernel].
-
-kernel(Config) when is_list(Config) ->
-    ?line run(Config, {kernel, dir}),
-    ok.
-
-run(Config, TestCase) ->
-    case run_test(Config, TestCase) of
-        ok -> ok;
-        {fail, Reason} ->
-            ?t:format("~s",[Reason]),
-            fail()
-    end.
-
-run_test(Config, {TestCase, Kind}) ->
-    Dog = ?config(watchdog, Config),
-    Options = ?dialyzer_options,
-    Dir = ?datadir,
-    OutDir = ?privdir,
-    case dialyzer_test:dialyzer_test(Options, TestCase, Kind,
-                                     Dir, OutDir, Dog) of
-        same -> ok;
-        {differ, DiffList} ->
-            {fail,
-               io_lib:format("\nTest ~p failed:\n~p\n",
-                            [TestCase, DiffList])}
-    end.
-
-fail() ->
-    io:format("failed\n"),
-    ?t:fail().
+  [options2_tests_SUITE_consistency,kernel].
+
+dialyze(Config, TestCase) ->
+  Opts = ?config(dialyzer_options, Config),
+  Dir = ?config(data_dir, Config),
+  OutDir = ?config(priv_dir, Config),
+  dialyzer_common:check(TestCase, Opts, Dir, OutDir).
+
+options2_tests_SUITE_consistency(Config) ->
+  Dir = ?config(data_dir, Config),
+  case dialyzer_common:new_tests(Dir, all()) of
+    []  -> ok;
+    New -> ct:fail({missing_tests,New})
+  end.
+
+kernel(Config) ->
+  case dialyze(Config, kernel) of
+    'same' -> 'same';
+    Error  -> ct:fail(Error)
+  end.
+