diff options
author | Lukas Larsson <[email protected]> | 2010-10-12 10:47:49 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2011-02-17 17:28:28 +0100 |
commit | 17637a1353c6be871d4fc4cc17f70b012eebc254 (patch) | |
tree | 08d4f443ff86ee818dbae42c52c301139d2dc8cf /erts/emulator/test/hash_SUITE.erl | |
parent | 3d0f4a3085f11389e5b22d10f96f0cbf08c9337f (diff) | |
download | otp-17637a1353c6be871d4fc4cc17f70b012eebc254.tar.gz otp-17637a1353c6be871d4fc4cc17f70b012eebc254.tar.bz2 otp-17637a1353c6be871d4fc4cc17f70b012eebc254.zip |
Update emulator tests to conform with common_test standard
Diffstat (limited to 'erts/emulator/test/hash_SUITE.erl')
-rw-r--r-- | erts/emulator/test/hash_SUITE.erl | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/erts/emulator/test/hash_SUITE.erl b/erts/emulator/test/hash_SUITE.erl index f5d1871bfb..d5841b9e93 100644 --- a/erts/emulator/test/hash_SUITE.erl +++ b/erts/emulator/test/hash_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% Copyright Ericsson AB 2000-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -49,7 +49,7 @@ -define(config(A,B),config(A,B)). -export([config/2]). -else. --include("test_server.hrl"). +-include_lib("test_server/include/test_server.hrl"). -endif. -ifdef(debug). @@ -69,7 +69,7 @@ config(priv_dir,_) -> ".". -else. %% When run in test server. --export([all/1,test_basic/1,test_cmp/1,test_range/1,test_spread/1, +-export([all/0,groups/0,init_per_group/2,end_per_group/2,test_basic/1,test_cmp/1,test_range/1,test_spread/1, test_phash2/1,otp_5292/1,bit_level_binaries/1,otp_7127/1, fin_per_testcase/2,init_per_testcase/2]). init_per_testcase(_Case, Config) -> @@ -80,11 +80,19 @@ fin_per_testcase(_Case, Config) -> Dog=?config(watchdog, Config), test_server:timetrap_cancel(Dog), ok. -all(doc) -> - ["Test erlang:phash"]; -all(suite) -> - [test_basic, test_cmp, test_range, test_spread, test_phash2, otp_5292, - bit_level_binaries, otp_7127]. +all() -> +[test_basic, test_cmp, test_range, test_spread, + test_phash2, otp_5292, bit_level_binaries, otp_7127]. + +groups() -> + []. + +init_per_group(_GroupName, Config) -> + Config. + +end_per_group(_GroupName, Config) -> + Config. + test_basic(suite) -> []; |