← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/megaco/test/megaco_actions_test.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/megaco/test/megaco_actions_test.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
72
72
    process_flag(trap_exit, true),
73
73
    megaco_test_lib:init_per_testcase(Case, Config).
74
74
 
75
 
fin_per_testcase(Case, Config) ->
 
75
end_per_testcase(Case, Config) ->
76
76
    process_flag(trap_exit, false),
77
 
    megaco_test_lib:fin_per_testcase(Case, Config).
 
77
    megaco_test_lib:end_per_testcase(Case, Config).
78
78
 
79
79
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
80
80
 
81
 
all(suite) ->
82
 
    Cases = 
83
 
        [
84
 
         pretty_text,
85
 
         flex_pretty_text,
86
 
         compact_text,
87
 
         flex_compact_text,
88
 
         erl_dist,
89
 
         erl_dist_mc,
90
 
         ber_bin,
91
 
         ber_bin_drv,
92
 
         ber_bin_native,
93
 
         ber_bin_drv_native
94
 
        ],
95
 
    Cases.
96
 
 
 
81
all() -> 
 
82
    [pretty_text, flex_pretty_text, compact_text,
 
83
     flex_compact_text, erl_dist, erl_dist_mc, ber_bin,
 
84
     ber_bin_drv, ber_bin_native, ber_bin_drv_native].
 
85
 
 
86
groups() -> 
 
87
    [].
 
88
 
 
89
init_per_group(_GroupName, Config) ->
 
90
    Config.
 
91
 
 
92
end_per_group(_GroupName, Config) ->
 
93
    Config.
97
94
 
98
95
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
99
96