Skip to content

Commit bd41233

Browse files
committed
Update testproxy version to 0.0.5
The skip-test-harness option allows disabling the second test set in the test harness: SSL config tests, which fails with the new versions of OpenSSL. TODO: We need more detailed tests and more detailed testproxy config options.
1 parent 6faecf2 commit bd41233

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tests/testproxy/GNUmakefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PROJECT_ROOT= ../..
22
TESTPROXY:= ~/.cargo/bin/testproxy
33

44
TESTPROXY_VERSION=$(shell $(TESTPROXY) -V)
5-
ifneq ($(TESTPROXY_VERSION),testproxy 0.0.4)
6-
$(error Use Testproxy v0.0.4 with this version of SSLproxy, found $(TESTPROXY_VERSION))
5+
ifneq ($(TESTPROXY_VERSION),testproxy 0.0.5)
6+
$(error Use Testproxy v0.0.5 with this version of SSLproxy, found $(TESTPROXY_VERSION))
77
endif
88

99
ifeq ($(findstring -DWITHOUT_USERAUTH,$(shell $(PROJECT_ROOT)/src/sslproxy -V 2>&1 | grep "Features: ")),-DWITHOUT_USERAUTH)
@@ -27,10 +27,11 @@ test: SSLPROXY_CONF:=$(if $(TLS11),$(SSLPROXY_CONF),sslproxy_no_tls11.conf)
2727
test: SSLPROXY_COMMAND=$(PROJECT_ROOT)/src/sslproxy -f $(SSLPROXY_CONF) -o Debug=no -o Daemon=yes -o User=nobody
2828
test: TESTHARNESS=$(if $(TLS13),testharness.json,testharness_no_tls13.json)
2929
test: TESTHARNESS:=$(if $(TLS11),$(TESTHARNESS),testharness_no_tls11.json)
30+
#test: SKIP_TESTHARNESS=2
3031
test: buildsslproxy buildlp
3132
sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) ./lp/lp -f ./lp/lp.conf -o Debug=no -o Daemon=yes -o User=nobody
3233
sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(SSLPROXY_COMMAND)
33-
$(TESTPROXY) -f $(TESTHARNESS) -l 4
34+
$(TESTPROXY) -f $(TESTHARNESS) -l 4 --skip-test-harness $(SKIP_TESTHARNESS)
3435
sudo pkill sslproxy
3536
sudo pkill lp
3637

0 commit comments

Comments
 (0)