diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2021-09-09 15:02:34 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2021-09-09 15:02:34 +0000 |
| commit | 828e22bb341804820ca544ac737e4db6024ae028 (patch) | |
| tree | a3b41cb5589361d1af07f491b2a406d22ec971ed /regress/lib | |
| parent | 950c55e7b55938b353218d44513db010342755d5 (diff) | |
Rework openssl-ruby-tests to run all passing tests first, then
run the one failing test as a separate regress test. This way,
all regressions should be caught with REGRESS_FAIL_EARLY=yes or
on bluhm's regress webpage.
This needs an up-to-date openssl-ruby-tests package and an
upcoming commit by beck in x509_verify.c to work.
ok beck bluhm
Diffstat (limited to 'regress/lib')
| -rw-r--r-- | regress/lib/libssl/openssl-ruby/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/regress/lib/libssl/openssl-ruby/Makefile b/regress/lib/libssl/openssl-ruby/Makefile index fe5ddf801b9..6616f689c78 100644 --- a/regress/lib/libssl/openssl-ruby/Makefile +++ b/regress/lib/libssl/openssl-ruby/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2021/09/06 20:52:59 tb Exp $ +# $OpenBSD: Makefile,v 1.5 2021/09/09 15:02:33 tb Exp $ OPENSSL_RUBY_TESTS = /usr/local/share/openssl-ruby-tests RUBY_BINREV = 30 @@ -15,8 +15,8 @@ regress: @echo SKIPPED .else -REGRESS_TARGETS += openssl-ruby-test -REGRESS_EXPECTED_FAILURES += openssl-ruby-test +REGRESS_TARGETS += openssl-ruby-test client-ca-test +REGRESS_EXPECTED_FAILURES += client-ca-test openssl-ruby-test: retest @@ -37,7 +37,8 @@ ${_BUILD_COOKIE}: ${_BUILDDIR_COOKIE} OPENSSL_RUBY_TESTSRC = ${OPENSSL_RUBY_TESTS}/test/openssl/test_*.rb ${_TEST_COOKIE}: ${_BUILD_COOKIE} ${_BUILDDIR_COOKIE} cd ${BUILDDIR} && \ - ${RUBY} -I. -I${OPENSSL_RUBY_TESTS}/test/openssl \ + env SKIP_CLIENT_CA_TEST=true ${RUBY} -I. \ + -I${OPENSSL_RUBY_TESTS}/test/openssl \ -I${OPENSSL_RUBY_TESTS}/lib \ -e 'Dir["${OPENSSL_RUBY_TESTSRC}"].each{|f| require f}' \ -- --no-use-color --no-show-detail-immediately @@ -56,6 +57,13 @@ retest: rm -f ${_TEST_COOKIE} ${_MAKE} test +client-ca-test: ${_BUILD_COOKIE} + cd ${BUILDDIR} && \ + ${RUBY} -I. -I${OPENSSL_RUBY_TESTS}/test/openssl \ + -I${OPENSSL_RUBY_TESTS}/lib \ + ${OPENSSL_RUBY_TESTS}/test/openssl/test_ssl.rb \ + -n test_client_ca + CLEANFILES += ${_BUILD_COOKIE} ${_TEST_COOKIE} ${_BUILDDIR_COOKIE} . if make(clean) || make(cleandir) |