summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libssl/openssl-ruby/Makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/regress/lib/libssl/openssl-ruby/Makefile b/src/regress/lib/libssl/openssl-ruby/Makefile
index 6616f689c7..bbdb33e4e4 100644
--- a/src/regress/lib/libssl/openssl-ruby/Makefile
+++ b/src/regress/lib/libssl/openssl-ruby/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.5 2021/09/09 15:02:33 tb Exp $ 1# $OpenBSD: Makefile,v 1.6 2021/10/28 11:01:19 tb Exp $
2 2
3OPENSSL_RUBY_TESTS = /usr/local/share/openssl-ruby-tests 3OPENSSL_RUBY_TESTS = /usr/local/share/openssl-ruby-tests
4RUBY_BINREV = 30 4RUBY_BINREV = 30
@@ -15,8 +15,7 @@ regress:
15 @echo SKIPPED 15 @echo SKIPPED
16.else 16.else
17 17
18REGRESS_TARGETS += openssl-ruby-test client-ca-test 18REGRESS_TARGETS += openssl-ruby-test
19REGRESS_EXPECTED_FAILURES += client-ca-test
20 19
21openssl-ruby-test: retest 20openssl-ruby-test: retest
22 21
@@ -37,7 +36,7 @@ ${_BUILD_COOKIE}: ${_BUILDDIR_COOKIE}
37OPENSSL_RUBY_TESTSRC = ${OPENSSL_RUBY_TESTS}/test/openssl/test_*.rb 36OPENSSL_RUBY_TESTSRC = ${OPENSSL_RUBY_TESTS}/test/openssl/test_*.rb
38${_TEST_COOKIE}: ${_BUILD_COOKIE} ${_BUILDDIR_COOKIE} 37${_TEST_COOKIE}: ${_BUILD_COOKIE} ${_BUILDDIR_COOKIE}
39 cd ${BUILDDIR} && \ 38 cd ${BUILDDIR} && \
40 env SKIP_CLIENT_CA_TEST=true ${RUBY} -I. \ 39 env SKIP_EXPECTED_FAILURES=true ${RUBY} -I. \
41 -I${OPENSSL_RUBY_TESTS}/test/openssl \ 40 -I${OPENSSL_RUBY_TESTS}/test/openssl \
42 -I${OPENSSL_RUBY_TESTS}/lib \ 41 -I${OPENSSL_RUBY_TESTS}/lib \
43 -e 'Dir["${OPENSSL_RUBY_TESTSRC}"].each{|f| require f}' \ 42 -e 'Dir["${OPENSSL_RUBY_TESTSRC}"].each{|f| require f}' \
@@ -57,12 +56,16 @@ retest:
57 rm -f ${_TEST_COOKIE} 56 rm -f ${_TEST_COOKIE}
58 ${_MAKE} test 57 ${_MAKE} test
59 58
60client-ca-test: ${_BUILD_COOKIE} 59.for _t in test_client_ca test_post_connection_check_wildcard_san
60REGRESS_TARGETS += ${_t}
61REGRESS_EXPECTED_FAILURES += ${_t}
62${_t}: ${_BUILD_COOKIE}
61 cd ${BUILDDIR} && \ 63 cd ${BUILDDIR} && \
62 ${RUBY} -I. -I${OPENSSL_RUBY_TESTS}/test/openssl \ 64 ${RUBY} -I. -I${OPENSSL_RUBY_TESTS}/test/openssl \
63 -I${OPENSSL_RUBY_TESTS}/lib \ 65 -I${OPENSSL_RUBY_TESTS}/lib \
64 ${OPENSSL_RUBY_TESTS}/test/openssl/test_ssl.rb \ 66 ${OPENSSL_RUBY_TESTS}/test/openssl/test_ssl.rb \
65 -n test_client_ca 67 -n ${_t}
68.endfor
66 69
67CLEANFILES += ${_BUILD_COOKIE} ${_TEST_COOKIE} ${_BUILDDIR_COOKIE} 70CLEANFILES += ${_BUILD_COOKIE} ${_TEST_COOKIE} ${_BUILDDIR_COOKIE}
68 71