← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/kernel/test/interactive_shell_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/interactive_shell_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
17
17
%% %CopyrightEnd%
18
18
%%
19
19
-module(interactive_shell_SUITE).
20
 
-include("test_server.hrl").
21
 
-export([all/1, get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
 
20
-include_lib("test_server/include/test_server.hrl").
 
21
-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 
22
         init_per_group/2,end_per_group/2, 
 
23
         get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
22
24
         job_control_remote/1,
23
25
         job_control_remote_noshell/1]).
24
26
 
44
46
    test_server:timetrap_cancel(Dog).
45
47
 
46
48
 
47
 
all(suite) ->
48
 
    [get_columns_and_rows, exit_initial, job_control_local, 
 
49
suite() -> [{ct_hooks,[ts_install_cth]}].
 
50
 
 
51
all() -> 
 
52
    [get_columns_and_rows, exit_initial, job_control_local,
49
53
     job_control_remote, job_control_remote_noshell].
50
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
 
51
71
%-define(DEBUG,1).
52
72
-ifdef(DEBUG).
53
73
-define(dbg(Data),erlang:display(Data)).