[COMMIT osv master] httpserver: use openjdk8-from-host module in tests

5 views
Skip to first unread message

Commit Bot

unread,
Mar 19, 2020, 2:15:47 PM3/19/20
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

httpserver: use openjdk8-from-host module in tests

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/modules/httpserver-api/Makefile b/modules/httpserver-api/Makefile
--- a/modules/httpserver-api/Makefile
+++ b/modules/httpserver-api/Makefile
@@ -101,13 +101,13 @@ check: check-http check-ssl
check-http:
# Test plain HTTP
cd $(src) && \
- make image=httpserver-api,openjdk8-zulu-full,jetty && \
+ make image=httpserver-api,openjdk8-from-host,jetty && \
PYTHONPATH=$(src)/scripts modules/httpserver-api/tests/testhttpserver-api.py

check-ssl:
# Test SSL
cd $(src) && \
- make image=httpserver-api.daemon_ssl,certs,openjdk8-zulu-full,jetty && \
+ make image=httpserver-api.daemon_ssl,certs,openjdk8-from-host,jetty && \
PYTHONPATH=$(src)/scripts modules/httpserver-api/tests/testhttpserver-api.py \
--cert modules/certs/build/client.pem \
--key modules/certs/build/client.key \
Reply all
Reply to author
Forward
0 new messages