From 38f306dc4e1e8fef657be0e1d6ac2e9f933483c5 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 10 Dec 2020 19:43:50 +0100 Subject: [PATCH] chore(test): Make test profile build --- Makefile | 8 ++++++++ test/emqx_SUITE.erl | 2 +- test/emqx_access_control_SUITE.erl | 2 +- test/emqx_alarm_SUITE.erl | 4 ++-- test/emqx_banned_SUITE.erl | 2 +- test/emqx_broker_SUITE.erl | 4 ++-- test/emqx_channel_SUITE.erl | 4 ++-- test/emqx_client_SUITE.erl | 2 +- test/emqx_cm_SUITE.erl | 2 +- test/emqx_connection_SUITE.erl | 2 +- test/emqx_frame_SUITE.erl | 2 +- test/emqx_listeners_SUITE.erl | 4 ++-- test/emqx_message_SUITE.erl | 4 ++-- test/emqx_metrics_SUITE.erl | 2 +- test/emqx_mod_acl_internal_SUITE.erl | 2 +- test/emqx_mod_delayed_SUITE.erl | 2 +- test/emqx_mod_presence_SUITE.erl | 2 +- test/emqx_mod_rewrite_SUITE.erl | 2 +- test/emqx_mod_subscription_SUITE.erl | 2 +- test/emqx_mountpoint_SUITE.erl | 2 +- test/emqx_mqtt_SUITE.erl | 2 +- test/emqx_mqtt_caps_SUITE.erl | 2 +- test/emqx_mqtt_props_SUITE.erl | 2 +- test/emqx_mqueue_SUITE.erl | 4 ++-- test/emqx_packet_SUITE.erl | 4 ++-- test/emqx_plugins_SUITE.erl | 2 +- test/emqx_reason_codes_SUITE.erl | 2 +- test/emqx_request_handler.erl | 2 +- test/emqx_request_responser_SUITE.erl | 2 +- test/emqx_request_sender.erl | 2 +- test/emqx_router_SUITE.erl | 2 +- test/emqx_session_SUITE.erl | 2 +- test/emqx_shared_sub_SUITE.erl | 2 +- test/emqx_sys_mon_SUITE.erl | 2 +- test/emqx_takeover_SUITE.erl | 2 +- test/emqx_trie_SUITE.erl | 2 +- test/emqx_ws_connection_SUITE.erl | 4 ++-- test/mqtt_protocol_v5_SUITE.erl | 4 ++-- test/props/prop_emqx_frame.erl | 2 +- test/props/prop_emqx_reason_codes.erl | 2 +- 40 files changed, 56 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index a33d9817e..51f96243e 100644 --- a/Makefile +++ b/Makefile @@ -66,5 +66,13 @@ else endif $(REBAR) as $(@:deps-%=%) get-deps +.PHONY: xref +xref: $(REBAR) + $(REBAR) as check xref + +.PHONY: dialyzer +dialyzer: $(REBAR) + $(REBAR) as check dialyzer + include packages.mk include docker.mk diff --git a/test/emqx_SUITE.erl b/test/emqx_SUITE.erl index 48c2177e1..56a78e00e 100644 --- a/test/emqx_SUITE.erl +++ b/test/emqx_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/test/emqx_access_control_SUITE.erl b/test/emqx_access_control_SUITE.erl index a327eea6d..2681f31ad 100644 --- a/test/emqx_access_control_SUITE.erl +++ b/test/emqx_access_control_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_alarm_SUITE.erl b/test/emqx_alarm_SUITE.erl index 863806ff6..2f3b42fd2 100644 --- a/test/emqx_alarm_SUITE.erl +++ b/test/emqx_alarm_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_banned_SUITE.erl b/test/emqx_banned_SUITE.erl index d99530e12..a4030fc57 100644 --- a/test/emqx_banned_SUITE.erl +++ b/test/emqx_banned_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_broker_SUITE.erl b/test/emqx_broker_SUITE.erl index d52132497..41ec2ba62 100644 --- a/test/emqx_broker_SUITE.erl +++ b/test/emqx_broker_SUITE.erl @@ -24,8 +24,8 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_channel_SUITE.erl b/test/emqx_channel_SUITE.erl index 613da40ac..15f3c6674 100644 --- a/test/emqx_channel_SUITE.erl +++ b/test/emqx_channel_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/test/emqx_client_SUITE.erl b/test/emqx_client_SUITE.erl index e231e40ab..e6b400308 100644 --- a/test/emqx_client_SUITE.erl +++ b/test/emqx_client_SUITE.erl @@ -21,7 +21,7 @@ -import(lists, [nth/2]). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/test/emqx_cm_SUITE.erl b/test/emqx_cm_SUITE.erl index 6a4b84d01..070a30303 100644 --- a/test/emqx_cm_SUITE.erl +++ b/test/emqx_cm_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(CM, emqx_cm). diff --git a/test/emqx_connection_SUITE.erl b/test/emqx_connection_SUITE.erl index 2538aeecb..06fbcbf20 100644 --- a/test/emqx_connection_SUITE.erl +++ b/test/emqx_connection_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_frame_SUITE.erl b/test/emqx_frame_SUITE.erl index 5d4e146db..fa24dc910 100644 --- a/test/emqx_frame_SUITE.erl +++ b/test/emqx_frame_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). -include_lib("emqx_ct_helpers/include/emqx_ct.hrl"). diff --git a/test/emqx_listeners_SUITE.erl b/test/emqx_listeners_SUITE.erl index 1472cc072..ecfcf46ed 100644 --- a/test/emqx_listeners_SUITE.erl +++ b/test/emqx_listeners_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_message_SUITE.erl b/test/emqx_message_SUITE.erl index 2eebdc1dc..fec7967c8 100644 --- a/test/emqx_message_SUITE.erl +++ b/test/emqx_message_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_metrics_SUITE.erl b/test/emqx_metrics_SUITE.erl index 33f297e7d..e55ce505b 100644 --- a/test/emqx_metrics_SUITE.erl +++ b/test/emqx_metrics_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_mod_acl_internal_SUITE.erl b/test/emqx_mod_acl_internal_SUITE.erl index bd9a0bf5a..5152cb79a 100644 --- a/test/emqx_mod_acl_internal_SUITE.erl +++ b/test/emqx_mod_acl_internal_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_mod_delayed_SUITE.erl b/test/emqx_mod_delayed_SUITE.erl index 9a049981c..3759e8c4d 100644 --- a/test/emqx_mod_delayed_SUITE.erl +++ b/test/emqx_mod_delayed_SUITE.erl @@ -25,7 +25,7 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). %%-------------------------------------------------------------------- %% Setups diff --git a/test/emqx_mod_presence_SUITE.erl b/test/emqx_mod_presence_SUITE.erl index 49d5d206b..3eac4005e 100644 --- a/test/emqx_mod_presence_SUITE.erl +++ b/test/emqx_mod_presence_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_mod_rewrite_SUITE.erl b/test/emqx_mod_rewrite_SUITE.erl index e3c19200e..e2174bffb 100644 --- a/test/emqx_mod_rewrite_SUITE.erl +++ b/test/emqx_mod_rewrite_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(RULES, [{rewrite, pub, <<"x/#">>,<<"^x/y/(.+)$">>,<<"z/y/$1">>}, diff --git a/test/emqx_mod_subscription_SUITE.erl b/test/emqx_mod_subscription_SUITE.erl index 06cd17cea..1b3d0cb92 100644 --- a/test/emqx_mod_subscription_SUITE.erl +++ b/test/emqx_mod_subscription_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_mountpoint_SUITE.erl b/test/emqx_mountpoint_SUITE.erl index 26d717cd8..ed37dce2e 100644 --- a/test/emqx_mountpoint_SUITE.erl +++ b/test/emqx_mountpoint_SUITE.erl @@ -25,7 +25,7 @@ , replvar/2 ]). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_mqtt_SUITE.erl b/test/emqx_mqtt_SUITE.erl index 27bd46a7f..853680edf 100644 --- a/test/emqx_mqtt_SUITE.erl +++ b/test/emqx_mqtt_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/test/emqx_mqtt_caps_SUITE.erl b/test/emqx_mqtt_caps_SUITE.erl index 695d69642..c40f484ae 100644 --- a/test/emqx_mqtt_caps_SUITE.erl +++ b/test/emqx_mqtt_caps_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_mqtt_props_SUITE.erl b/test/emqx_mqtt_props_SUITE.erl index f440b386d..ba2064419 100644 --- a/test/emqx_mqtt_props_SUITE.erl +++ b/test/emqx_mqtt_props_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("emqx_ct_helpers/include/emqx_ct.hrl"). diff --git a/test/emqx_mqueue_SUITE.erl b/test/emqx_mqueue_SUITE.erl index 3be1344a2..43320be47 100644 --- a/test/emqx_mqueue_SUITE.erl +++ b/test/emqx_mqueue_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/test/emqx_packet_SUITE.erl b/test/emqx_packet_SUITE.erl index 00ab6e0c5..468a461fd 100644 --- a/test/emqx_packet_SUITE.erl +++ b/test/emqx_packet_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/test/emqx_plugins_SUITE.erl b/test/emqx_plugins_SUITE.erl index ad99209e6..b3a524848 100644 --- a/test/emqx_plugins_SUITE.erl +++ b/test/emqx_plugins_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_reason_codes_SUITE.erl b/test/emqx_reason_codes_SUITE.erl index 027d6d85f..2b9a57aed 100644 --- a/test/emqx_reason_codes_SUITE.erl +++ b/test/emqx_reason_codes_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_request_handler.erl b/test/emqx_request_handler.erl index 690d45d34..921b1a713 100644 --- a/test/emqx_request_handler.erl +++ b/test/emqx_request_handler.erl @@ -18,7 +18,7 @@ -export([start_link/4, stop/1]). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -type qos() :: emqx_mqtt_types:qos_name() | emqx_mqtt_types:qos(). -type topic() :: emqx_topic:topic(). diff --git a/test/emqx_request_responser_SUITE.erl b/test/emqx_request_responser_SUITE.erl index 7d66c7760..be6ff623d 100644 --- a/test/emqx_request_responser_SUITE.erl +++ b/test/emqx_request_responser_SUITE.erl @@ -17,7 +17,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/test/emqx_request_sender.erl b/test/emqx_request_sender.erl index aed845a42..1ae78b37c 100644 --- a/test/emqx_request_sender.erl +++ b/test/emqx_request_sender.erl @@ -18,7 +18,7 @@ -export([start_link/3, stop/1, send/6]). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). start_link(ResponseTopic, QoS, Options0) -> Parent = self(), diff --git a/test/emqx_router_SUITE.erl b/test/emqx_router_SUITE.erl index fb2d34ea7..731d47fb9 100644 --- a/test/emqx_router_SUITE.erl +++ b/test/emqx_router_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(R, emqx_router). diff --git a/test/emqx_session_SUITE.erl b/test/emqx_session_SUITE.erl index dd9611b71..089087f9e 100644 --- a/test/emqx_session_SUITE.erl +++ b/test/emqx_session_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> emqx_ct:all(?MODULE). diff --git a/test/emqx_shared_sub_SUITE.erl b/test/emqx_shared_sub_SUITE.erl index 218e8a073..71f25e96e 100644 --- a/test/emqx_shared_sub_SUITE.erl +++ b/test/emqx_shared_sub_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/test/emqx_sys_mon_SUITE.erl b/test/emqx_sys_mon_SUITE.erl index ef0e31957..02429f60f 100644 --- a/test/emqx_sys_mon_SUITE.erl +++ b/test/emqx_sys_mon_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(SYSMON, emqx_sys_mon). diff --git a/test/emqx_takeover_SUITE.erl b/test/emqx_takeover_SUITE.erl index ca5ebb084..3238d2bc9 100644 --- a/test/emqx_takeover_SUITE.erl +++ b/test/emqx_takeover_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/test/emqx_trie_SUITE.erl b/test/emqx_trie_SUITE.erl index f1db3813c..a489222e3 100644 --- a/test/emqx_trie_SUITE.erl +++ b/test/emqx_trie_SUITE.erl @@ -19,7 +19,7 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). +-include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). -define(TRIE, emqx_trie). diff --git a/test/emqx_ws_connection_SUITE.erl b/test/emqx_ws_connection_SUITE.erl index 125b14a74..4eda9ab33 100644 --- a/test/emqx_ws_connection_SUITE.erl +++ b/test/emqx_ws_connection_SUITE.erl @@ -16,8 +16,8 @@ -module(emqx_ws_connection_SUITE). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/test/mqtt_protocol_v5_SUITE.erl b/test/mqtt_protocol_v5_SUITE.erl index 33d7d923d..fd798e759 100644 --- a/test/mqtt_protocol_v5_SUITE.erl +++ b/test/mqtt_protocol_v5_SUITE.erl @@ -19,8 +19,8 @@ -compile(export_all). -compile(nowarn_export_all). --include("emqx.hrl"). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("eunit/include/eunit.hrl"). -import(lists, [nth/2]). diff --git a/test/props/prop_emqx_frame.erl b/test/props/prop_emqx_frame.erl index 731e4ba1e..8ca847043 100644 --- a/test/props/prop_emqx_frame.erl +++ b/test/props/prop_emqx_frame.erl @@ -16,7 +16,7 @@ -module(prop_emqx_frame). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("proper/include/proper.hrl"). %%-------------------------------------------------------------------- diff --git a/test/props/prop_emqx_reason_codes.erl b/test/props/prop_emqx_reason_codes.erl index f6f5e81b0..5469456ea 100644 --- a/test/props/prop_emqx_reason_codes.erl +++ b/test/props/prop_emqx_reason_codes.erl @@ -16,7 +16,7 @@ -module(prop_emqx_reason_codes). --include("emqx_mqtt.hrl"). +-include_lib("emqx/include/emqx_mqtt.hrl"). -include_lib("proper/include/proper.hrl"). %%--------------------------------------------------------------------