File tree Expand file tree Collapse file tree 2 files changed +17
-7
lines changed Expand file tree Collapse file tree 2 files changed +17
-7
lines changed Original file line number Diff line number Diff line change @@ -148,10 +148,6 @@ jobs:
148
148
run : echo "OPENSSL_CONF=$(pwd)/test/openssl/fixtures/ssl/openssl_fips.cnf" >> $GITHUB_ENV
149
149
if : matrix.fips-enabled
150
150
151
- - name : set fips environment variable for testing.
152
- run : echo "TEST_RUBY_OPENSSL_FIPS_ENABLED=true" >> $GITHUB_ENV
153
- if : matrix.fips-enabled
154
-
155
151
- name : load ruby
156
152
uses : ruby/setup-ruby@v1
157
153
with :
@@ -180,7 +176,5 @@ jobs:
180
176
# TODO Fix other tests, and run all the tests on FIPS module.
181
177
- name : test on fips module
182
178
run : |
183
- bundle exec rake debug &&
184
- ruby -I./lib -ropenssl \
185
- -e 'Dir.glob "./test/openssl/{test_fips.rb,test_pkey.rb}", &method(:require)'
179
+ rake test_fips TESTOPTS="-v --no-show-detail-immediately"
186
180
if : matrix.fips-enabled
Original file line number Diff line number Diff line change @@ -18,12 +18,28 @@ Rake::TestTask.new do |t|
18
18
t . warning = true
19
19
end
20
20
21
+ desc 'Run tests for fips'
22
+ task :test_fips do
23
+ ENV [ 'TEST_RUBY_OPENSSL_FIPS_ENABLED' ] = 'true'
24
+ Rake ::Task [ 'test_fips_internal' ] . invoke
25
+ end
26
+
27
+ Rake ::TestTask . new ( :test_fips_internal ) do |t |
28
+ t . libs << 'test/openssl'
29
+ t . test_files = FileList [
30
+ 'test/openssl/test_fips.rb' ,
31
+ 'test/openssl/test_pkey.rb' ,
32
+ ]
33
+ t . warning = true
34
+ end
35
+
21
36
RDoc ::Task . new do |rdoc |
22
37
rdoc . main = "README.md"
23
38
rdoc . rdoc_files . include ( "*.md" , "lib/**/*.rb" , "ext/**/*.c" )
24
39
end
25
40
26
41
task :test => [ :compile , :debug ]
42
+ task :test_fips => [ :compile , :debug ]
27
43
28
44
# Print Ruby and compiler info for debugging purpose.
29
45
task :debug_compiler do
You can’t perform that action at this time.
0 commit comments