diff options
| author | Siri Hansen <[email protected]> | 2017-01-11 11:37:44 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-01-11 11:37:44 +0100 |
| commit | 947e0e1176b5b985293e27164ee8e6912dee8133 (patch) | |
| tree | c91b7f098d9a8fd80def4f95ed7c6a508d7958ab /lib/common_test/test | |
| parent | 605a4627a7383829559a1595457b860c1317da48 (diff) | |
| parent | 11d938ba2da697fafb9e177bea8ad7de0387304a (diff) | |
| download | otp-947e0e1176b5b985293e27164ee8e6912dee8133.tar.gz otp-947e0e1176b5b985293e27164ee8e6912dee8133.tar.bz2 otp-947e0e1176b5b985293e27164ee8e6912dee8133.zip | |
Merge branch 'siri/ct/add_app_tests' into maint
* siri/ct/add_app_tests:
Add ct_default_gl to common_test.app.src
[ct] Add tests for .app and .appup files
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/Makefile | 3 | ||||
| -rw-r--r-- | lib/common_test/test/ct_SUITE.erl | 53 |
2 files changed, 55 insertions, 1 deletions
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile index b1eddfedd7..2f0fc2e05a 100644 --- a/lib/common_test/test/Makefile +++ b/lib/common_test/test/Makefile @@ -70,7 +70,8 @@ MODULES= \ test_server_SUITE \ test_server_test_lib \ ct_release_test_SUITE \ - ct_log_SUITE + ct_log_SUITE \ + ct_SUITE ERL_FILES= $(MODULES:%=%.erl) HRL_FILES= test_server_test_lib.hrl diff --git a/lib/common_test/test/ct_SUITE.erl b/lib/common_test/test/ct_SUITE.erl new file mode 100644 index 0000000000..eb98c2544f --- /dev/null +++ b/lib/common_test/test/ct_SUITE.erl @@ -0,0 +1,53 @@ +%% +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 2009-2016. All Rights Reserved. +%% +%% Licensed under the Apache License, Version 2.0 (the "License"); +%% you may not use this file except in compliance with the License. +%% You may obtain a copy of the License at +%% +%% http://www.apache.org/licenses/LICENSE-2.0 +%% +%% Unless required by applicable law or agreed to in writing, software +%% distributed under the License is distributed on an "AS IS" BASIS, +%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +%% See the License for the specific language governing permissions and +%% limitations under the License. +%% +%% %CopyrightEnd% +%% +-module(ct_SUITE). + +-compile(export_all). + +-include_lib("common_test/include/ct.hrl"). + +suite() -> + [{timetrap,{seconds,30}}]. + +init_per_suite(Config) -> + Config. + +end_per_suite(_Config) -> + ok. + +init_per_testcase(_TestCase, Config) -> + Config. + +end_per_testcase(_TestCase, _Config) -> + ok. + +all() -> + [app_file, appup_file]. + +%%%----------------------------------------------------------------- +%%% Test cases + +app_file(_Config) -> + ok = test_server:app_test(common_test), + ok. + +appup_file(_Config) -> + ok = test_server:appup_test(common_test). + |