← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/stdlib/test/sys_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:
lib/stdlib/test/sys_SUITE.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1996-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
17
17
%% %CopyrightEnd%
18
18
%%
19
19
-module(sys_SUITE).
20
 
-export([all/1,log/1,log_to_file/1,stats/1,trace/1,suspend/1,install/1]).
 
20
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 
21
         init_per_group/2,end_per_group/2,log/1,log_to_file/1,
 
22
         stats/1,trace/1,suspend/1,install/1]).
21
23
-export([handle_call/3,terminate/2,init/1]).
22
 
-include("test_server.hrl").
 
24
-include_lib("test_server/include/test_server.hrl").
23
25
 
24
26
-define(server,sys_SUITE_server).
25
27
 
29
31
%% system messages at all.
30
32
 
31
33
 
32
 
all(suite) -> [log,log_to_file,stats,trace,suspend,install].
 
34
suite() -> [{ct_hooks,[ts_install_cth]}].
 
35
 
 
36
all() -> 
 
37
    [log, log_to_file, stats, trace, suspend, install].
 
38
 
 
39
groups() -> 
 
40
    [].
 
41
 
 
42
init_per_suite(Config) ->
 
43
    Config.
 
44
 
 
45
end_per_suite(_Config) ->
 
46
    ok.
 
47
 
 
48
init_per_group(_GroupName, Config) ->
 
49
    Config.
 
50
 
 
51
end_per_group(_GroupName, Config) ->
 
52
    Config.
 
53
 
33
54
 
34
55
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
35
56