diff options
| author | Erlang/OTP <[email protected]> | 2017-11-15 14:40:00 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-11-15 14:40:00 +0100 |
| commit | 5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b (patch) | |
| tree | d31ae4a84d9654df1abbe3e44a6cbbf676f3a0a6 /lib/crypto | |
| parent | 24e0ec632a12f8f5ef2afc7cfc2118b7db6c1df9 (diff) | |
| parent | 599107f1dcc6533c094301ad21919c7c697b9a1b (diff) | |
| download | otp-5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b.tar.gz otp-5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b.tar.bz2 otp-5e3a6a639e22b4e5b0b0b0c4d4407e4c553c377b.zip | |
Merge branch 'hans/fix_build_env/OTP-14765' into maint-18
* hans/fix_build_env/OTP-14765:
Remove unused test include file from test suites
eldap: Repair Makefile
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/test/blowfish_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/test/blowfish_SUITE.erl b/lib/crypto/test/blowfish_SUITE.erl index b0d6954820..4cac932a6a 100644 --- a/lib/crypto/test/blowfish_SUITE.erl +++ b/lib/crypto/test/blowfish_SUITE.erl @@ -25,7 +25,7 @@ -compile(export_all). -include_lib("test_server/include/test_server.hrl"). --include("test_server_line.hrl"). + -define(TIMEOUT, 120000). % 2 min |