umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00
Code Issues Wiki Activity

Don't error out when h2spec can't be compiled

Browse source
This commit is contained in:
Loïc Hoguin 2019-03-10 11:21:51 +01:00
parent 4918e271bd
commit b9d329c026
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -71,8 +71,8 @@ test-build:: $(H2SPEC)
$(H2SPEC): $(H2SPEC):
$(gen_verbose) mkdir -p $(GOPATH)/src/github.com/summerwind $(gen_verbose) mkdir -p $(GOPATH)/src/github.com/summerwind
$(verbose) git clone --depth 1 https://github.com/summerwind/h2spec $(dir $(H2SPEC)) $(verbose) git clone --depth 1 https://github.com/summerwind/h2spec $(dir $(H2SPEC)) || true
$(verbose) $(MAKE) -C $(dir $(H2SPEC)) build MAKEFLAGS= $(verbose) $(MAKE) -C $(dir $(H2SPEC)) build MAKEFLAGS= || true
# Use erl_make_certs from the tested release during CI # Use erl_make_certs from the tested release during CI
# and ensure that ct_helper is always recompiled. # and ensure that ct_helper is always recompiled.

15
test/h2spec_SUITE.erl
View file

@ -28,11 +28,16 @@ init_per_suite(Config) ->
case os:getenv("H2SPEC") of case os:getenv("H2SPEC") of
false -> false ->
skip; skip;
_ -> H2spec ->
cowboy_test:init_http(h2spec, #{ case filelib:is_file(H2spec) of
env => #{dispatch => init_dispatch()}, false ->
max_concurrent_streams => 100 skip;
}, Config) true ->
cowboy_test:init_http(h2spec, #{
env => #{dispatch => init_dispatch()},
max_concurrent_streams => 100
}, Config)
end
end. end.
end_per_suite(_Config) -> end_per_suite(_Config) ->