From b7d8105ef0856bc30dfd018ccd357582a9f3f129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20S=C3=B6derqvist?= Date: Thu, 12 Nov 2020 14:30:59 +0100 Subject: Replace erlang:get_stacktrace() with catch C:E (V=0) or C:E:S (V>0) This makes us compatible with OTP < 21, except when V (verbose) is set. --- plugins/asciidoc.mk | 4 ++-- plugins/proper.mk | 4 ++-- plugins/triq.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/asciidoc.mk b/plugins/asciidoc.mk index f4be7ff..778308b 100644 --- a/plugins/asciidoc.mk +++ b/plugins/asciidoc.mk @@ -57,8 +57,8 @@ try }) end || F <- [$(shell echo $(addprefix $(comma)\",$(addsuffix \",$1)) | sed 's/^.//')]], halt(0) -catch C:E -> - io:format("Exception ~p:~p~nStacktrace: ~p~n", [C, E, erlang:get_stacktrace()]), +catch C:E$(if $V,:S) -> + io:format("Exception: ~p:~p~n$(if $V,Stacktrace: ~p~n)", [C, E$(if $V,$(comma) S)]), halt(1) end. endef diff --git a/plugins/proper.mk b/plugins/proper.mk index 6262199..55a2788 100644 --- a/plugins/proper.mk +++ b/plugins/proper.mk @@ -37,8 +37,8 @@ define proper_check.erl end of true -> halt(0); _ -> halt(1) - catch error:undef -> - io:format("Undefined property or module?~n~p~n", [erlang:get_stacktrace()]), + catch error:undef$(if $V,:Stacktrace) -> + io:format("Undefined property or module?~n$(if $V,~p~n)", [$(if $V,Stacktrace)]), halt(0) end. endef diff --git a/plugins/triq.mk b/plugins/triq.mk index 8791e2c..6d41376 100644 --- a/plugins/triq.mk +++ b/plugins/triq.mk @@ -26,8 +26,8 @@ define triq_check.erl end of true -> halt(0); _ -> halt(1) - catch error:undef -> - io:format("Undefined property or module?~n~p~n", [erlang:get_stacktrace()]), + catch error:undef$(if $V,:Stacktrace) -> + io:format("Undefined property or module?~n$(if $V,~p~n)", [$(if $V,Stacktrace)]), halt(0) end. endef -- cgit v1.2.3