Skip to content

Commit b3970c7

Browse files
authored
travis-ci: upgrade dist of travis-ci to ubuntu bionic. (#365)
1 parent e521741 commit b3970c7

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sudo: required
2-
dist: trusty
2+
dist: bionic
33

44
branches:
55
only:
@@ -101,4 +101,4 @@ script:
101101
- ngx-build $NGINX_VERSION --with-ipv6 --with-http_realip_module --with-http_ssl_module --with-pcre-jit --with-cc-opt="-I$OPENSSL_INC -I$PCRE_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB -L$PCRE_LIB -Wl,-rpath,$PCRE_LIB" --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../set-misc-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug --with-stream_ssl_module --with-stream --with-ipv6 --add-module=../stream-lua-nginx-module > build.log 2>&1 || (cat build.log && exit 1)
102102
- nginx -V
103103
- ldd `which nginx`|grep -E 'luajit|ssl|pcre'
104-
- prove -Itest-nginx/lib -j$JOBS -r t
104+
- prove -I. -Itest-nginx/lib -j$JOBS -r t

t/ssl-session-fetch.t

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,15 @@ qr/content_by_lua\(nginx\.conf:\d+\):\d+: CONNECTED/
492492
qr/failed to resume session: failed to de-serialize session|ssl_session_(fetch|store)_by_lua_block:\d+: session id: [a-fA-F\d]+/s
493493
--- grep_error_log_out eval
494494
[
495-
qr/^ssl_session_store_by_lua_block:\d+: session id: [a-fA-F\d]+$/s,
496495
qr/^ssl_session_fetch_by_lua_block:\d+: session id: [a-fA-F\d]+
497496
failed to resume session: failed to de-serialize session
498497
ssl_session_store_by_lua_block:\d+: session id: [a-fA-F\d]+
499498
$/s,
500-
qr/ssl_session_fetch_by_lua_block:\d+: session id: [a-fA-F\d]+
499+
qr/^ssl_session_fetch_by_lua_block:\d+: session id: [a-fA-F\d]+
500+
failed to resume session: failed to de-serialize session
501+
ssl_session_store_by_lua_block:\d+: session id: [a-fA-F\d]+
502+
$/s,
503+
qr/^ssl_session_fetch_by_lua_block:\d+: session id: [a-fA-F\d]+
501504
failed to resume session: failed to de-serialize session
502505
ssl_session_store_by_lua_block:\d+: session id: [a-fA-F\d]+
503506
$/s,
@@ -507,6 +510,7 @@ $/s,
507510
[alert]
508511
[emerg]
509512
[error]
513+
--- timeout: 5
510514
511515
512516

t/stream/ssl.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,6 +1821,7 @@ qr/subject=\/?C(?<eq>\s?=\s?)US(?<sep>\/|,\s)ST\k<eq>California\k<sep>L\k<eq>San
18211821
--- no_error_log
18221822
[error]
18231823
[alert]
1824+
--- timeout: 5
18241825

18251826

18261827

0 commit comments

Comments
 (0)