walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

tests: Fix compile error with gcc-4.7

This commit is contained in:
Tatsuhiro Tsujikawa 2015-02-22 17:43:00 +09:00
parent da2376effd
commit 6051ff63e0
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/nghttp2_session_test.c
View File

@ -7165,7 +7165,6 @@ void test_nghttp2_http_non_final_response(void) {
}; };
nghttp2_outbound_item *item; nghttp2_outbound_item *item;
nghttp2_frame_hd hd; nghttp2_frame_hd hd;
nghttp2_stream *stream;
mem = nghttp2_mem_default(); mem = nghttp2_mem_default();
frame_pack_bufs_init(&bufs); frame_pack_bufs_init(&bufs);
@ -7178,9 +7177,8 @@ void test_nghttp2_http_non_final_response(void) {
nghttp2_hd_deflate_init(&deflater, mem); nghttp2_hd_deflate_init(&deflater, mem);
/* non-final HEADERS with END_STREAM is illegal */ /* non-final HEADERS with END_STREAM is illegal */
stream = nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE,
&pri_spec_default, &pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
NGHTTP2_STREAM_OPENING, NULL);
rv = pack_headers(&bufs, &deflater, 1, rv = pack_headers(&bufs, &deflater, 1,
NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM, NGHTTP2_FLAG_END_HEADERS | NGHTTP2_FLAG_END_STREAM,
@ -7200,9 +7198,8 @@ void test_nghttp2_http_non_final_response(void) {
nghttp2_bufs_reset(&bufs); nghttp2_bufs_reset(&bufs);
/* non-final HEADERS followed by non-empty DATA is illegal */ /* non-final HEADERS followed by non-empty DATA is illegal */
stream = nghttp2_session_open_stream(session, 3, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 3, NGHTTP2_STREAM_FLAG_NONE,
&pri_spec_default, &pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
NGHTTP2_STREAM_OPENING, NULL);
rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS, rv = pack_headers(&bufs, &deflater, 3, NGHTTP2_FLAG_END_HEADERS,
nonfinal_resnv, ARRLEN(nonfinal_resnv), mem); nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
@ -7226,9 +7223,8 @@ void test_nghttp2_http_non_final_response(void) {
/* non-final HEADERS followed by empty DATA (without END_STREAM) is /* non-final HEADERS followed by empty DATA (without END_STREAM) is
ok */ ok */
stream = nghttp2_session_open_stream(session, 5, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 5, NGHTTP2_STREAM_FLAG_NONE,
&pri_spec_default, &pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
NGHTTP2_STREAM_OPENING, NULL);
rv = pack_headers(&bufs, &deflater, 5, NGHTTP2_FLAG_END_HEADERS, rv = pack_headers(&bufs, &deflater, 5, NGHTTP2_FLAG_END_HEADERS,
nonfinal_resnv, ARRLEN(nonfinal_resnv), mem); nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
@ -7249,9 +7245,8 @@ void test_nghttp2_http_non_final_response(void) {
/* non-final HEADERS followed by empty DATA (with END_STREAM) is /* non-final HEADERS followed by empty DATA (with END_STREAM) is
illegal */ illegal */
stream = nghttp2_session_open_stream(session, 7, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 7, NGHTTP2_STREAM_FLAG_NONE,
&pri_spec_default, &pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
NGHTTP2_STREAM_OPENING, NULL);
rv = pack_headers(&bufs, &deflater, 7, NGHTTP2_FLAG_END_HEADERS, rv = pack_headers(&bufs, &deflater, 7, NGHTTP2_FLAG_END_HEADERS,
nonfinal_resnv, ARRLEN(nonfinal_resnv), mem); nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);
@ -7275,9 +7270,8 @@ void test_nghttp2_http_non_final_response(void) {
nghttp2_bufs_reset(&bufs); nghttp2_bufs_reset(&bufs);
/* non-final HEADERS followed by final HEADERS is OK */ /* non-final HEADERS followed by final HEADERS is OK */
stream = nghttp2_session_open_stream(session, 9, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 9, NGHTTP2_STREAM_FLAG_NONE,
&pri_spec_default, &pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
NGHTTP2_STREAM_OPENING, NULL);
rv = pack_headers(&bufs, &deflater, 9, NGHTTP2_FLAG_END_HEADERS, rv = pack_headers(&bufs, &deflater, 9, NGHTTP2_FLAG_END_HEADERS,
nonfinal_resnv, ARRLEN(nonfinal_resnv), mem); nonfinal_resnv, ARRLEN(nonfinal_resnv), mem);

4
tests/nghttp2_test_helper.h
View File

@ -35,8 +35,8 @@
#define MAKE_NV(NAME, VALUE) \ #define MAKE_NV(NAME, VALUE) \
{ \ { \
(uint8_t *) NAME, (uint8_t *)VALUE, strlen(NAME), strlen(VALUE), \ (uint8_t *)(NAME), (uint8_t *)(VALUE), sizeof((NAME)) - 1, \
NGHTTP2_NV_FLAG_NONE \ sizeof((VALUE)) - 1, NGHTTP2_NV_FLAG_NONE \
} }
#define ARRLEN(ARR) (sizeof(ARR) / sizeof(ARR[0])) #define ARRLEN(ARR) (sizeof(ARR) / sizeof(ARR[0]))