← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/kernel/test/inet_sockopt_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/kernel/test/inet_sockopt_SUITE.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2007-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
18
18
%%
19
19
-module(inet_sockopt_SUITE).
20
20
 
21
 
-include("test_server.hrl").
 
21
-include_lib("test_server/include/test_server.hrl").
22
22
 
23
23
 
24
24
-define(C_GET_IPPROTO_TCP,1).
48
48
 
49
49
-define(C_QUIT,99).
50
50
 
51
 
-export([all/1, simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
 
51
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 
52
         init_per_group/2,end_per_group/2, 
 
53
         simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
52
54
         doc_examples_raw/1,doc_examples_raw_getbin/1,
53
55
         large_raw/1,large_raw_getbin/1,combined/1,combined_getbin/1,
54
56
         type_errors/1]).
56
58
-export([init_per_testcase/2, end_per_testcase/2]).
57
59
 
58
60
 
59
 
all(suite) ->
60
 
    [simple,loop_all,simple_raw,simple_raw_getbin,
61
 
     doc_examples_raw, doc_examples_raw_getbin,
62
 
     large_raw,large_raw_getbin,combined,combined_getbin,type_errors].
 
61
suite() -> [{ct_hooks,[ts_install_cth]}].
 
62
 
 
63
all() -> 
 
64
    [simple, loop_all, simple_raw, simple_raw_getbin,
 
65
     doc_examples_raw, doc_examples_raw_getbin, large_raw,
 
66
     large_raw_getbin, combined, combined_getbin,
 
67
     type_errors].
 
68
 
 
69
groups() -> 
 
70
    [].
 
71
 
 
72
init_per_suite(Config) ->
 
73
    Config.
 
74
 
 
75
end_per_suite(_Config) ->
 
76
    ok.
 
77
 
 
78
init_per_group(_GroupName, Config) ->
 
79
    Config.
 
80
 
 
81
end_per_group(_GroupName, Config) ->
 
82
    Config.
 
83
 
63
84
 
64
85
init_per_testcase(_Func, Config) ->
65
86
    Dog = test_server:timetrap(test_server:seconds(60)),