← Back to branch summary

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

« back to all changes in this revision

Viewing changes to erts/emulator/test/exception_SUITE.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:
erts/emulator/test/exception_SUITE.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1997-2011. 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
19
19
 
20
20
-module(exception_SUITE).
21
21
 
22
 
-export([all/1, badmatch/1, pending_errors/1, nil_arith/1,
 
22
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 
23
         init_per_group/2,end_per_group/2, 
 
24
         badmatch/1, pending_errors/1, nil_arith/1,
23
25
         stacktrace/1, nested_stacktrace/1, raise/1, gunilla/1, per/1,
24
26
         exception_with_heap_frag/1]).
25
27
 
26
28
-export([bad_guy/2]).
27
29
 
28
 
-include("test_server.hrl").
 
30
-include_lib("test_server/include/test_server.hrl").
29
31
-import(lists, [foreach/2]).
30
32
 
31
 
all(suite) ->
32
 
    [badmatch, pending_errors, nil_arith, 
33
 
     stacktrace, nested_stacktrace, raise, gunilla, per,
 
33
suite() -> [{ct_hooks,[ts_install_cth]}].
 
34
 
 
35
all() -> 
 
36
    [badmatch, pending_errors, nil_arith, stacktrace,
 
37
     nested_stacktrace, raise, gunilla, per,
34
38
     exception_with_heap_frag].
35
39
 
 
40
groups() -> 
 
41
    [].
 
42
 
 
43
init_per_suite(Config) ->
 
44
    Config.
 
45
 
 
46
end_per_suite(_Config) ->
 
47
    ok.
 
48
 
 
49
init_per_group(_GroupName, Config) ->
 
50
    Config.
 
51
 
 
52
end_per_group(_GroupName, Config) ->
 
53
    Config.
 
54
 
 
55
 
36
56
-define(try_match(E),
37
57
        catch ?MODULE:bar(),
38
58
        {'EXIT', {{badmatch, nomatch}, _}} = (catch E = id(nomatch))).