← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/test_server/src/test_server_sup.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-06-11 12:18:07 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090611121807-ks7eb4xrt7dsysgx
Tags: 1:13.b.1-dfsg-1
http://bugs.debian.org/529512
* New upstream release.
* Removed unnecessary dependency of erlang-os-mon on erlang-observer and
  erlang-tools and added missing dependency of erlang-nox on erlang-os-mon
  (closes: #529512).
* Removed a patch to eunit application because the bug was fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/test_server/src/test_server_sup.erl
473
473
 
474
474
 
475
475
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
476
 
%% framework_call(Callback,Func,Args,DefaultReturn) -> Retur | DefaultReturn
 
476
%% framework_call(Callback,Func,Args,DefaultReturn) -> Return | DefaultReturn
477
477
%% 
478
478
%% Calls the given Func in Callback
479
479
framework_call(Func,Args) ->
576
576
%% from TraceSpecFile and enable call trace for
577
577
%% specified functions.
578
578
call_trace(TraceSpec) ->
 
579
    case catch try_call_trace(TraceSpec) of
 
580
        {'EXIT',Reason} ->
 
581
            erlang:display(Reason),
 
582
            exit(Reason);
 
583
        Ok ->
 
584
            Ok
 
585
    end.    
 
586
 
 
587
try_call_trace(TraceSpec) ->
579
588
    case file:consult(TraceSpec) of
580
589
        {ok,Terms} ->
581
590
            dbg:tracer(),