diff options
author | Anders Svensson <[email protected]> | 2013-03-06 22:26:10 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2013-03-24 15:50:58 +0100 |
commit | 2458d263c46c90ac55a6eaf5cbca18b02c8a65f2 (patch) | |
tree | 6dc426ccf9c9a7368c9d8bf9d119a564bddfa31a | |
parent | da0355042254d98a06acddbf7361bd0f0f4b4f7f (diff) | |
download | otp-2458d263c46c90ac55a6eaf5cbca18b02c8a65f2.tar.gz otp-2458d263c46c90ac55a6eaf5cbca18b02c8a65f2.tar.bz2 otp-2458d263c46c90ac55a6eaf5cbca18b02c8a65f2.zip |
Minor tweaks and fixes
Fix a broken include in example code, remove an inappropriate ct:pal/2
outside of a testcase, echo more info from test/Makefile.
-rw-r--r-- | lib/diameter/examples/code/redirect_cb.erl | 4 | ||||
-rw-r--r-- | lib/diameter/test/Makefile | 5 | ||||
-rw-r--r-- | lib/diameter/test/diameter_ct.erl | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/lib/diameter/examples/code/redirect_cb.erl b/lib/diameter/examples/code/redirect_cb.erl index da31add70d..69836774a1 100644 --- a/lib/diameter/examples/code/redirect_cb.erl +++ b/lib/diameter/examples/code/redirect_cb.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2012. All Rights Reserved. +%% Copyright Ericsson AB 2010-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -20,7 +20,7 @@ -module(redirect_cb). -include_lib("diameter/include/diameter.hrl"). --include_lib("diameter/src/app/diameter_gen_base_rfc3588.hrl"). +-include_lib("diameter/include/diameter_gen_base_rfc3588.hrl"). %% diameter callbacks -export([peer_up/3, diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile index 061f0bcbef..9719c67b32 100644 --- a/lib/diameter/test/Makefile +++ b/lib/diameter/test/Makefile @@ -93,6 +93,11 @@ info: @$(call list,HRL_FILES) @echo @$(call list,SUITES) + @echo + @echo erl = $(shell which erl) + @erl -noinput \ + -eval 'io:format("diameter = ~s~n", [code:lib_dir(diameter)])' \ + -s init stop @echo ======================================== help: diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl index 1697287a22..ed2f884681 100644 --- a/lib/diameter/test/diameter_ct.erl +++ b/lib/diameter/test/diameter_ct.erl @@ -53,7 +53,7 @@ info(L0, L1) -> L0, L1), Diff = [T, C, {memory, M}], - ct:pal("INFO: ~p~n", [Diff]). + io:format("INFO: ~p~n", [Diff]). diff(time, T0, T1) -> timer:now_diff(T1, T0); |