~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/orber/test/iop_ior_11_SUITE.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%%
4
 
%% Copyright Ericsson AB 1997-2010. 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
25
25
%%-----------------------------------------------------------------
26
26
-module(iop_ior_11_SUITE).
27
27
 
28
 
-include("test_server.hrl").
 
28
-include_lib("test_server/include/test_server.hrl").
29
29
-include_lib("orber/src/orber_iiop.hrl").
30
30
 
31
31
-define(default_timeout, ?t:minutes(3)).
33
33
%%-----------------------------------------------------------------
34
34
%% External exports
35
35
%%-----------------------------------------------------------------
36
 
-export([all/1]).
 
36
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 
37
         init_per_group/2,end_per_group/2]).
37
38
 
38
39
%%-----------------------------------------------------------------
39
40
%% Internal exports
46
47
%% Args: 
47
48
%% Returns: 
48
49
%%-----------------------------------------------------------------
49
 
all(doc) -> ["Description", "more description"];
50
 
all(suite) -> 
 
50
suite() -> [{ct_hooks,[ts_install_cth]}].
 
51
 
 
52
all() -> 
51
53
    [encoding, create_and_get_ops].
52
54
 
 
55
groups() -> 
 
56
    [].
 
57
 
 
58
init_per_suite(Config) ->
 
59
    Config.
 
60
 
 
61
end_per_suite(_Config) ->
 
62
    ok.
 
63
 
 
64
init_per_group(_GroupName, Config) ->
 
65
    Config.
 
66
 
 
67
end_per_group(_GroupName, Config) ->
 
68
    Config.
 
69
 
 
70
 
53
71
%%-----------------------------------------------------------------
54
72
%% Init and cleanup functions.
55
73
%%-----------------------------------------------------------------
59
77
    [{watchdog, Dog}|Config].
60
78
 
61
79
 
62
 
fin_per_testcase(_Case, Config) ->
 
80
end_per_testcase(_Case, Config) ->
63
81
    Dog = ?config(watchdog, Config),
64
82
    test_server:timetrap_cancel(Dog),
65
83
    ok.