diff options
| author | Peter Andersson <[email protected]> | 2012-08-27 12:02:55 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-27 12:02:55 +0200 |
| commit | 30e714a61860745769f4f2eab0f5cb5e0d4dc947 (patch) | |
| tree | 8e8afe35bce871d6105c748799ddf296741e4c84 /lib/common_test | |
| parent | ab24f85be4a730cb5c5d85ba6e57a53b503a8e03 (diff) | |
| parent | 25250a48715911788a610122271b05cc30876442 (diff) | |
| download | otp-30e714a61860745769f4f2eab0f5cb5e0d4dc947.tar.gz otp-30e714a61860745769f4f2eab0f5cb5e0d4dc947.tar.bz2 otp-30e714a61860745769f4f2eab0f5cb5e0d4dc947.zip | |
Merge remote branch 'origin/peppe/common_test/bad_func_spec' into maint
* origin/peppe/common_test/bad_func_spec:
Fix error in function specification
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/src/ct_hooks.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl index d0432b604d..1bcc63738e 100644 --- a/lib/common_test/src/ct_hooks.erl +++ b/lib/common_test/src/ct_hooks.erl @@ -48,7 +48,7 @@ %% @doc Called before any suites are started -spec init(State :: term()) -> ok | - {error, Reason :: term()}. + {fail, Reason :: term()}. init(Opts) -> call(get_new_hooks(Opts, undefined) ++ get_builtin_hooks(Opts), ok, init, []). |