diff options
Diffstat (limited to 'lib/megaco')
| -rw-r--r-- | lib/megaco/Makefile | 29 | ||||
| -rw-r--r-- | lib/megaco/configure.in | 2 | ||||
| -rw-r--r-- | lib/megaco/priv/plt/.gitignore | 2 | ||||
| -rw-r--r-- | lib/megaco/test/megaco_mess_test.erl | 19 |
4 files changed, 32 insertions, 20 deletions
diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile index 10efaf667f..9dc84c122c 100644 --- a/lib/megaco/Makefile +++ b/lib/megaco/Makefile @@ -97,9 +97,8 @@ endif CONFIGURE_OPTS = $(FLEX_SCANNER_LINENO_ENABLER) $(FLEX_SCANNER_REENTRANT_ENABLER) -MEGACO_DIA_PLT = ./priv/megaco.plt -MEGACO_DIA_PLT_LOG = $(basename $(MEGACO_DIA_PLT)).dialyzer_plt_log -MEGACO_DIA_LOG = $(basename $(MEGACO_DIA_PLT)).dialyzer_log +DIA_PLT = ./priv/plt/$(APPLICATION).plt +DIA_ANALYSIS = $(basename $(DIA_PLT)).dialyzer_analysis # ---------------------------------------------------- @@ -140,8 +139,8 @@ info: @echo "OTP_INSTALL_DIR: $(OTP_INSTALL_DIR)" @echo "APP_INSTALL_DIR: $(APP_INSTALL_DIR)" @echo "" - @echo "MEGACO_PLT = $(MEGACO_PLT)" - @echo "MEGACO_DIA_LOG = $(MEGACO_DIA_LOG)" + @echo "DIA_PLT: $(DIA_PLT)" + @echo "DIA_ANALYSIS: $(DIA_ANALYSIS)" @echo "" version: @@ -201,18 +200,18 @@ tar: $(APP_TAR_FILE) $(APP_TAR_FILE): $(APP_DIR) (cd $(APP_RELEASE_DIR); gtar zcf $(APP_TAR_FILE) $(DIR_NAME)) -dialyzer_plt: $(MEGACO_DIA_PLT) +dialyzer_plt: $(DIA_PLT) -$(MEGACO_DIA_PLT): - @echo "Building megaco plt file" +$(DIA_PLT): + @echo "Building $(APPLICATION) plt file" @dialyzer --build_plt \ --output_plt $@ \ - -r ../megaco/ebin \ - -o $(MEGACO_DIA_PLT_LOG) \ + -r ../$(APPLICATION)/ebin \ + --output $(DIA_ANALYSIS) \ --verbose -dialyzer: $(MEGACO_DIA_PLT) - (dialyzer --plt $< \ - -o $(MEGACO_DIA_LOG) \ - ../megaco/ebin \ - && (shell cat $(MEGACO_DIA_LOG))) +dialyzer: $(DIA_PLT) + @echo "Running dialyzer on $(APPLICATION)" + @dialyzer --plt $< \ + ../$(APPLICATION)/ebin \ + --verbose diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in index b88e17ec85..42c50b8961 100644 --- a/lib/megaco/configure.in +++ b/lib/megaco/configure.in @@ -208,7 +208,7 @@ if test "X$host" = "Xwin32"; then else case $host_os in darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" + CFLAGS="$CFLAGS -fno-common" ;; esac diff --git a/lib/megaco/priv/plt/.gitignore b/lib/megaco/priv/plt/.gitignore new file mode 100644 index 0000000000..2051b52d48 --- /dev/null +++ b/lib/megaco/priv/plt/.gitignore @@ -0,0 +1,2 @@ +/*.plt +/*.dialyzer_analysis diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl index 383e3df774..b4334149fc 100644 --- a/lib/megaco/test/megaco_mess_test.erl +++ b/lib/megaco/test/megaco_mess_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% Copyright Ericsson AB 1999-2011. 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 @@ -456,9 +456,20 @@ connect(Config) when is_list(Config) -> ?VERIFY(bad_send_mod, megaco:user_info(MgMid, send_mod)), ?VERIFY(bad_send_mod, megaco:conn_info(PrelCH, send_mod)), SC = service_change_request(), - ?VERIFY({1, {error, {send_message_failed, {'EXIT', - {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}}}, - megaco:call(PrelCH, [SC], [])), + case megaco:call(PrelCH, [SC], []) of + {error, + {send_message_failed, + {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}} -> + ok; + + %% As of R15, we also get some extra info (line numbers, line numbers) + {error, + {send_message_failed, + {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _], _} | _]}}}} -> + ok; + Unexpected -> + ?ERROR(Unexpected) + end, ?VERIFY(ok, megaco:disconnect(PrelCH, shutdown)), |