diff options
-rw-r--r-- | src/regress/lib/libssl/openssl-ruby/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/regress/lib/libssl/openssl-ruby/Makefile b/src/regress/lib/libssl/openssl-ruby/Makefile index fe5ddf801b..6616f689c7 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.4 2021/09/06 20:52:59 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.5 2021/09/09 15:02:33 tb Exp $ |
2 | 2 | ||
3 | OPENSSL_RUBY_TESTS = /usr/local/share/openssl-ruby-tests | 3 | OPENSSL_RUBY_TESTS = /usr/local/share/openssl-ruby-tests |
4 | RUBY_BINREV = 30 | 4 | RUBY_BINREV = 30 |
@@ -15,8 +15,8 @@ regress: | |||
15 | @echo SKIPPED | 15 | @echo SKIPPED |
16 | .else | 16 | .else |
17 | 17 | ||
18 | REGRESS_TARGETS += openssl-ruby-test | 18 | REGRESS_TARGETS += openssl-ruby-test client-ca-test |
19 | REGRESS_EXPECTED_FAILURES += openssl-ruby-test | 19 | REGRESS_EXPECTED_FAILURES += client-ca-test |
20 | 20 | ||
21 | openssl-ruby-test: retest | 21 | openssl-ruby-test: retest |
22 | 22 | ||
@@ -37,7 +37,8 @@ ${_BUILD_COOKIE}: ${_BUILDDIR_COOKIE} | |||
37 | OPENSSL_RUBY_TESTSRC = ${OPENSSL_RUBY_TESTS}/test/openssl/test_*.rb | 37 | OPENSSL_RUBY_TESTSRC = ${OPENSSL_RUBY_TESTS}/test/openssl/test_*.rb |
38 | ${_TEST_COOKIE}: ${_BUILD_COOKIE} ${_BUILDDIR_COOKIE} | 38 | ${_TEST_COOKIE}: ${_BUILD_COOKIE} ${_BUILDDIR_COOKIE} |
39 | cd ${BUILDDIR} && \ | 39 | cd ${BUILDDIR} && \ |
40 | ${RUBY} -I. -I${OPENSSL_RUBY_TESTS}/test/openssl \ | 40 | env SKIP_CLIENT_CA_TEST=true ${RUBY} -I. \ |
41 | -I${OPENSSL_RUBY_TESTS}/test/openssl \ | ||
41 | -I${OPENSSL_RUBY_TESTS}/lib \ | 42 | -I${OPENSSL_RUBY_TESTS}/lib \ |
42 | -e 'Dir["${OPENSSL_RUBY_TESTSRC}"].each{|f| require f}' \ | 43 | -e 'Dir["${OPENSSL_RUBY_TESTSRC}"].each{|f| require f}' \ |
43 | -- --no-use-color --no-show-detail-immediately | 44 | -- --no-use-color --no-show-detail-immediately |
@@ -56,6 +57,13 @@ retest: | |||
56 | rm -f ${_TEST_COOKIE} | 57 | rm -f ${_TEST_COOKIE} |
57 | ${_MAKE} test | 58 | ${_MAKE} test |
58 | 59 | ||
60 | client-ca-test: ${_BUILD_COOKIE} | ||
61 | cd ${BUILDDIR} && \ | ||
62 | ${RUBY} -I. -I${OPENSSL_RUBY_TESTS}/test/openssl \ | ||
63 | -I${OPENSSL_RUBY_TESTS}/lib \ | ||
64 | ${OPENSSL_RUBY_TESTS}/test/openssl/test_ssl.rb \ | ||
65 | -n test_client_ca | ||
66 | |||
59 | CLEANFILES += ${_BUILD_COOKIE} ${_TEST_COOKIE} ${_BUILDDIR_COOKIE} | 67 | CLEANFILES += ${_BUILD_COOKIE} ${_TEST_COOKIE} ${_BUILDDIR_COOKIE} |
60 | 68 | ||
61 | . if make(clean) || make(cleandir) | 69 | . if make(clean) || make(cleandir) |