← Back to branch summary

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

« back to all changes in this revision

Viewing changes to erts/emulator/test/after_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/after_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
21
21
 
22
22
%% Tests receive after.
23
23
 
24
 
-include("test_server.hrl").
 
24
-include_lib("test_server/include/test_server.hrl").
25
25
 
26
 
-export([all/1, t_after/1, receive_after/1, receive_after_big/1,
 
26
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 
27
         init_per_group/2,end_per_group/2, 
 
28
         t_after/1, receive_after/1, receive_after_big/1,
27
29
         receive_after_errors/1, receive_var_zero/1, receive_zero/1,
28
30
         multi_timeout/1, receive_after_32bit/1]).
29
31
 
30
 
-export([init_per_testcase/2, fin_per_testcase/2]).
 
32
-export([init_per_testcase/2, end_per_testcase/2]).
31
33
 
32
34
%% Internal exports.
33
35
 
34
36
-export([timeout_g/0]).
35
37
 
36
 
all(suite) ->
37
 
    [t_after, receive_after, receive_after_big, receive_after_errors,
38
 
     receive_var_zero, receive_zero, multi_timeout, receive_after_32bit].
 
38
suite() -> [{ct_hooks,[ts_install_cth]}].
 
39
 
 
40
all() -> 
 
41
    [t_after, receive_after, receive_after_big,
 
42
     receive_after_errors, receive_var_zero, receive_zero,
 
43
     multi_timeout, receive_after_32bit].
 
44
 
 
45
groups() -> 
 
46
    [].
 
47
 
 
48
init_per_suite(Config) ->
 
49
    Config.
 
50
 
 
51
end_per_suite(_Config) ->
 
52
    ok.
 
53
 
 
54
init_per_group(_GroupName, Config) ->
 
55
    Config.
 
56
 
 
57
end_per_group(_GroupName, Config) ->
 
58
    Config.
 
59
 
39
60
 
40
61
init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
41
62
    Dog=?t:timetrap(?t:minutes(3)),
42
63
    [{watchdog, Dog}|Config].
43
64
 
44
 
fin_per_testcase(_Func, Config) ->
 
65
end_per_testcase(_Func, Config) ->
45
66
    Dog=?config(watchdog, Config),
46
67
    ?t:timetrap_cancel(Dog).
47
68