diff options
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/Makefile | 3 | ||||
| -rw-r--r-- | lib/sasl/doc/src/Makefile | 76 | ||||
| -rw-r--r-- | lib/sasl/src/systools_lib.erl | 6 | ||||
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl | 1 | ||||
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl | 1 | ||||
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl | 1 | ||||
| -rw-r--r-- | lib/sasl/test/sasl_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/sasl/test/sasl_report_SUITE.erl | 42 |
8 files changed, 44 insertions, 90 deletions
diff --git a/lib/sasl/Makefile b/lib/sasl/Makefile index 065eb45fbb..06af80fd35 100644 --- a/lib/sasl/Makefile +++ b/lib/sasl/Makefile @@ -36,3 +36,6 @@ SPECIAL_TARGETS = # include $(ERL_TOP)/make/otp_subdir.mk +DIA_PLT_APPS=tools + +include $(ERL_TOP)/make/app_targets.mk diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile index 8e1e8b502c..684fd2b5e4 100644 --- a/lib/sasl/doc/src/Makefile +++ b/lib/sasl/doc/src/Makefile @@ -27,11 +27,6 @@ VSN=$(SASL_VSN) APPLICATION=sasl # ---------------------------------------------------- -# Release directory specification -# ---------------------------------------------------- -RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) - -# ---------------------------------------------------- # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = ref_man.xml @@ -51,80 +46,13 @@ XML_CHAPTER_FILES = sasl_intro.xml \ BOOK_FILES = book.xml -GIF_FILES = +IMAGE_FILES = XML_FILES = \ $(BOOK_FILES) $(XML_CHAPTER_FILES) \ $(XML_PART_FILES) $(XML_REF3_FILES) $(XML_REF4_FILES) \ $(XML_REF6_FILES) $(XML_APPLICATION_FILES) - -# ---------------------------------------------------- - -HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \ - $(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) - -INFO_FILE = ../../info - -MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) -MAN4_FILES = $(XML_REF4_FILES:%.xml=$(MAN4DIR)/%.4) -MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6) - -HTML_REF_MAN_FILE = $(HTMLDIR)/index.html - -TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf - -# ---------------------------------------------------- -# FLAGS -# ---------------------------------------------------- -XML_FLAGS += - # ---------------------------------------------------- -# Targets -# ---------------------------------------------------- -$(HTMLDIR)/%.gif: %.gif - $(INSTALL_DATA) $< $@ - -docs: pdf html man - -$(TOP_PDF_FILE): $(XML_FILES) - -pdf: $(TOP_PDF_FILE) - -html: gifs $(HTML_REF_MAN_FILE) - -man: $(MAN3_FILES) $(MAN4_FILES) $(MAN6_FILES) - -gifs: $(GIF_FILES:%=$(HTMLDIR)/%) # We depend just to copy them to ../html - -debug opt: - -clean clean_docs: - rm -rf $(HTMLDIR)/* - rm -rf $(XMLDIR) - rm -f $(MAN3DIR)/* - rm -f $(MAN4DIR)/* - rm -f $(MAN6DIR)/* - rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo) - rm -f errs core *~ - -# ---------------------------------------------------- -# Release Target -# ---------------------------------------------------- -include $(ERL_TOP)/make/otp_release_targets.mk - -release_docs_spec: docs - $(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf" - $(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf" - $(INSTALL_DIR) "$(RELSYSDIR)/doc/html" - $(INSTALL_DATA) $(HTMLDIR)/* \ - "$(RELSYSDIR)/doc/html" - $(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)" - $(INSTALL_DIR) "$(RELEASE_PATH)/man/man3" - $(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3" - $(INSTALL_DIR) "$(RELEASE_PATH)/man/man4" - $(INSTALL_DATA) $(MAN4_FILES) "$(RELEASE_PATH)/man/man4" - $(INSTALL_DIR) "$(RELEASE_PATH)/man/man6" - $(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6" -release_spec: +include $(ERL_TOP)/make/doc.mk diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl index dd97aeff08..f5489e7900 100644 --- a/lib/sasl/src/systools_lib.erl +++ b/lib/sasl/src/systools_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -63,8 +63,8 @@ read_term(File) -> end. read_term_from_stream(Stream, File) -> - _ = epp:set_encoding(Stream), - R = io:request(Stream, {get_until,'',erl_scan,tokens,[1]}), + Encoding = epp:set_encoding(Stream), + R = io:request(Stream, {get_until,Encoding,'',erl_scan,tokens,[1]}), case R of {ok,Toks,_EndLine} -> case erl_parse:parse_term(Toks) of diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl index 418102bebb..e0ff480703 100644 --- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl +++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/src/m.erl @@ -8,4 +8,5 @@ start(NProcs) -> receive stop -> Cs end end) || _ <- lists:seq(1,NProcs)], + [unlink(Pid) || Pid <- Pids], {Modules,Pids}. diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl index 418102bebb..e0ff480703 100644 --- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl +++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/src/m.erl @@ -8,4 +8,5 @@ start(NProcs) -> receive stop -> Cs end end) || _ <- lists:seq(1,NProcs)], + [unlink(Pid) || Pid <- Pids], {Modules,Pids}. diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl index 2edc1e6be4..8ec3629e78 100644 --- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl +++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/src/m.erl @@ -8,4 +8,5 @@ start(NProcs) -> receive stop -> Cs end end) || _ <- lists:seq(1,NProcs)], + [unlink(Pid) || Pid <- Pids], {Modules,Pids}. diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl index fc80e37210..beb129c1a6 100644 --- a/lib/sasl/test/sasl_SUITE.erl +++ b/lib/sasl/test/sasl_SUITE.erl @@ -32,6 +32,8 @@ log_file/1, utc_log/1]). +-compile(r21). + all() -> [log_mf_h_env, log_file, app_test, appup_test, utc_log]. @@ -104,7 +106,7 @@ appup_tests(App,{OkVsns0,NokVsns}) -> create_test_vsns(App) -> ThisMajor = erlang:system_info(otp_release), FirstMajor = previous_major(ThisMajor), - SecondMajor = previous_major(FirstMajor), + SecondMajor = previous_major(previous_major(FirstMajor)), Ok = app_vsn(App,[ThisMajor,FirstMajor]), Nok0 = app_vsn(App,[SecondMajor]), Nok = case Ok of diff --git a/lib/sasl/test/sasl_report_SUITE.erl b/lib/sasl/test/sasl_report_SUITE.erl index e639b55cee..bc984754cc 100644 --- a/lib/sasl/test/sasl_report_SUITE.erl +++ b/lib/sasl/test/sasl_report_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2015-2018. All Rights Reserved. +%% Copyright Ericsson AB 2015-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]). -export([gen_server_crash/1, gen_server_crash_unicode/1]). +-export([gen_server_crash_chars_limit/1, + gen_server_crash_chars_limit_unicode/1]). -export([legacy_gen_server_crash/1, legacy_gen_server_crash_unicode/1]). -export([crash_me/0,start_link/0,init/1,handle_cast/2,terminate/2]). @@ -32,6 +34,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [gen_server_crash, gen_server_crash_unicode, + gen_server_crash_chars_limit, + gen_server_crash_chars_limit_unicode, legacy_gen_server_crash, legacy_gen_server_crash_unicode]. @@ -51,18 +55,31 @@ end_per_group(_GroupName, Config) -> Config. gen_server_crash(Config) -> - gen_server_crash(Config, latin1). + gen_server_crash(Config, latin1, depth). gen_server_crash_unicode(Config) -> - gen_server_crash(Config, unicode). + gen_server_crash(Config, unicode, depth). + +gen_server_crash_chars_limit(Config) -> + gen_server_crash(Config, latin1, chars_limit). + +gen_server_crash_chars_limit_unicode(Config) -> + gen_server_crash(Config, unicode, chars_limit). legacy_gen_server_crash(Config) -> - legacy_gen_server_crash(Config,latin1). + legacy_gen_server_crash(Config, latin1). legacy_gen_server_crash_unicode(Config) -> - legacy_gen_server_crash(Config,unicode). + legacy_gen_server_crash(Config, unicode). + +gen_server_crash(Config, Encoding, depth) -> + FormatterOpts = #{depth=>30}, + gen_server_crash(Config, Encoding, FormatterOpts, 70000, 150000); +gen_server_crash(Config, Encoding, chars_limit) -> + FormatterOpts = #{chars_limit=>50000, single_line=>true}, + gen_server_crash(Config, Encoding, FormatterOpts, 50000, 100000). -gen_server_crash(Config, Encoding) -> +gen_server_crash(Config, Encoding, FormatterOpts, Min, Max) -> TC = list_to_atom(lists:concat([?FUNCTION_NAME,"_",Encoding])), PrivDir = filename:join(?config(priv_dir,Config),?MODULE), ConfigFileName = filename:join(PrivDir,TC), @@ -85,9 +102,9 @@ gen_server_crash(Config, Encoding) -> " -boot start_sasl -kernel start_timer true " "-config ",ConfigFileName]}]), - %% Set depth - ok = rpc:call(Node,logger,update_formatter_config,[default,depth,30]), - ok = rpc:call(Node,logger,update_formatter_config,[sasl,depth,30]), + %% Set depth or chars_limit. + ok = rpc:call(Node,logger,update_formatter_config,[default,FormatterOpts]), + ok = rpc:call(Node,logger,update_formatter_config,[sasl,FormatterOpts]), %% Make sure remote node logs it's own logs, and current node does %% not log them. @@ -98,7 +115,7 @@ gen_server_crash(Config, Encoding) -> (_,_) -> ignore end,[]}), ct:log("Local node Logger config:~n~p", - [rpc:call(Node,logger,get_config,[])]), + [logger:get_config()]), ct:log("Remote node Logger config:~n~p", [rpc:call(Node,logger,get_config,[])]), ct:log("Remote node error_logger handlers: ~p", @@ -112,8 +129,8 @@ gen_server_crash(Config, Encoding) -> test_server:stop_node(Node), ok = logger:remove_primary_filter(no_remote), - check_file(KernelLog, utf8, 70000, 150000), - check_file(SaslLog, Encoding, 70000, 150000), + check_file(KernelLog, utf8, Min, Max), + check_file(SaslLog, Encoding, Min, Max), ok = file:delete(KernelLog), ok = file:delete(SaslLog), @@ -169,6 +186,7 @@ check_file(File, Encoding, Min, Max) -> _ -> io:format("~ts\n", [Bin]) end, Sz = byte_size(Bin), + %% Sz = string:length(string:replace(Bin, " ", "", all)), io:format("Size: ~p (allowed range is ~p..~p)\n", [Sz,Min,Max]), if |