Fixed inconsistency directory structure with ruby/ruby repo

50 files changed, 2 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index a3654cce..dedcce5d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,8 @@ rescue LoadError
 end
 
 Rake::TestTask.new do |t|
-  t.libs << 'test'
+  t.libs << 'test/openssl'
+  t.test_files = FileList["test/**/test_*.rb"]
   t.warning = true
 end
 
diff --git a/test/envutil.rb b/test/openssl/envutil.rb
index 05d6fe27..05d6fe27 100644
--- a/test/envutil.rb
+++ b/test/openssl/envutil.rb
diff --git a/test/fixtures/chain/dh512.pem b/test/openssl/fixtures/chain/dh512.pem
index fec138c7..fec138c7 100644
--- a/test/fixtures/chain/dh512.pem
+++ b/test/openssl/fixtures/chain/dh512.pem
diff --git a/test/fixtures/chain/server.crt b/test/openssl/fixtures/chain/server.crt
index d6b814f4..d6b814f4 100644
--- a/test/fixtures/chain/server.crt
+++ b/test/openssl/fixtures/chain/server.crt
diff --git a/test/fixtures/chain/server.csr b/test/openssl/fixtures/chain/server.csr
index 51b38e33..51b38e33 100644
--- a/test/fixtures/chain/server.csr
+++ b/test/openssl/fixtures/chain/server.csr
diff --git a/test/fixtures/chain/server.key b/test/openssl/fixtures/chain/server.key
index 9590235d..9590235d 100644
--- a/test/fixtures/chain/server.key
+++ b/test/openssl/fixtures/chain/server.key
diff --git a/test/fixtures/pkey/dh-1.pem b/test/openssl/fixtures/pkey/dh-1.pem
index 3340a6a1..3340a6a1 100644
--- a/test/fixtures/pkey/dh-1.pem
+++ b/test/openssl/fixtures/pkey/dh-1.pem
diff --git a/test/fixtures/pkey/dh1024.pem b/test/openssl/fixtures/pkey/dh1024.pem
index f99c757f..f99c757f 100644
--- a/test/fixtures/pkey/dh1024.pem
+++ b/test/openssl/fixtures/pkey/dh1024.pem
diff --git a/test/fixtures/pkey/dsa1024.pem b/test/openssl/fixtures/pkey/dsa1024.pem
index 1bf49889..1bf49889 100644
--- a/test/fixtures/pkey/dsa1024.pem
+++ b/test/openssl/fixtures/pkey/dsa1024.pem
diff --git a/test/fixtures/pkey/dsa256.pem b/test/openssl/fixtures/pkey/dsa256.pem
index d9a407f7..d9a407f7 100644
--- a/test/fixtures/pkey/dsa256.pem
+++ b/test/openssl/fixtures/pkey/dsa256.pem
diff --git a/test/fixtures/pkey/dsa512.pem b/test/openssl/fixtures/pkey/dsa512.pem
index 962c41cc..962c41cc 100644
--- a/test/fixtures/pkey/dsa512.pem
+++ b/test/openssl/fixtures/pkey/dsa512.pem
diff --git a/test/fixtures/pkey/p256.pem b/test/openssl/fixtures/pkey/p256.pem
index 97c97d9f..97c97d9f 100644
--- a/test/fixtures/pkey/p256.pem
+++ b/test/openssl/fixtures/pkey/p256.pem
diff --git a/test/fixtures/pkey/rsa-1.pem b/test/openssl/fixtures/pkey/rsa-1.pem
index bd5a624f..bd5a624f 100644
--- a/test/fixtures/pkey/rsa-1.pem
+++ b/test/openssl/fixtures/pkey/rsa-1.pem
diff --git a/test/fixtures/pkey/rsa-2.pem b/test/openssl/fixtures/pkey/rsa-2.pem
index e4fd4f43..e4fd4f43 100644
--- a/test/fixtures/pkey/rsa-2.pem
+++ b/test/openssl/fixtures/pkey/rsa-2.pem
diff --git a/test/fixtures/pkey/rsa-3.pem b/test/openssl/fixtures/pkey/rsa-3.pem
index 6c9c9ced..6c9c9ced 100644
--- a/test/fixtures/pkey/rsa-3.pem
+++ b/test/openssl/fixtures/pkey/rsa-3.pem
diff --git a/test/fixtures/pkey/rsa1024.pem b/test/openssl/fixtures/pkey/rsa1024.pem
index 464de074..464de074 100644
--- a/test/fixtures/pkey/rsa1024.pem
+++ b/test/openssl/fixtures/pkey/rsa1024.pem
diff --git a/test/fixtures/pkey/rsa2048.pem b/test/openssl/fixtures/pkey/rsa2048.pem
index ac89cd88..ac89cd88 100644
--- a/test/fixtures/pkey/rsa2048.pem
+++ b/test/openssl/fixtures/pkey/rsa2048.pem
diff --git a/test/test_asn1.rb b/test/openssl/test_asn1.rb
index 5f457551..5f457551 100644
--- a/test/test_asn1.rb
+++ b/test/openssl/test_asn1.rb
diff --git a/test/test_bn.rb b/test/openssl/test_bn.rb
index 547d334c..547d334c 100644
--- a/test/test_bn.rb
+++ b/test/openssl/test_bn.rb
diff --git a/test/test_buffering.rb b/test/openssl/test_buffering.rb
index 7575c5b4..7575c5b4 100644
--- a/test/test_buffering.rb
+++ b/test/openssl/test_buffering.rb
diff --git a/test/test_cipher.rb b/test/openssl/test_cipher.rb
index f6ec4980..f6ec4980 100644
--- a/test/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
diff --git a/test/test_config.rb b/test/openssl/test_config.rb
index dba66b08..dba66b08 100644
--- a/test/test_config.rb
+++ b/test/openssl/test_config.rb
diff --git a/test/test_digest.rb b/test/openssl/test_digest.rb
index e47fc0a3..e47fc0a3 100644
--- a/test/test_digest.rb
+++ b/test/openssl/test_digest.rb
diff --git a/test/test_engine.rb b/test/openssl/test_engine.rb
index 232ba866..232ba866 100644
--- a/test/test_engine.rb
+++ b/test/openssl/test_engine.rb
diff --git a/test/test_fips.rb b/test/openssl/test_fips.rb
index 8cd474f9..8cd474f9 100644
--- a/test/test_fips.rb
+++ b/test/openssl/test_fips.rb
diff --git a/test/test_hmac.rb b/test/openssl/test_hmac.rb
index 9cb3c5a8..9cb3c5a8 100644
--- a/test/test_hmac.rb
+++ b/test/openssl/test_hmac.rb
diff --git a/test/test_kdf.rb b/test/openssl/test_kdf.rb
index f4790c96..f4790c96 100644
--- a/test/test_kdf.rb
+++ b/test/openssl/test_kdf.rb
diff --git a/test/test_ns_spki.rb b/test/openssl/test_ns_spki.rb
index 052507de..052507de 100644
--- a/test/test_ns_spki.rb
+++ b/test/openssl/test_ns_spki.rb
diff --git a/test/test_ocsp.rb b/test/openssl/test_ocsp.rb
index a490a153..a490a153 100644
--- a/test/test_ocsp.rb
+++ b/test/openssl/test_ocsp.rb
diff --git a/test/test_ossl.rb b/test/openssl/test_ossl.rb
index f83e8136..f83e8136 100644
--- a/test/test_ossl.rb
+++ b/test/openssl/test_ossl.rb
diff --git a/test/test_pair.rb b/test/openssl/test_pair.rb
index e9cf98df..e9cf98df 100644
--- a/test/test_pair.rb
+++ b/test/openssl/test_pair.rb
diff --git a/test/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index fdbe753b..fdbe753b 100644
--- a/test/test_pkcs12.rb
+++ b/test/openssl/test_pkcs12.rb
diff --git a/test/test_pkcs7.rb b/test/openssl/test_pkcs7.rb
index d0d9dcaf..d0d9dcaf 100644
--- a/test/test_pkcs7.rb
+++ b/test/openssl/test_pkcs7.rb
diff --git a/test/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
index 6397e76d..6397e76d 100644
--- a/test/test_pkey_dh.rb
+++ b/test/openssl/test_pkey_dh.rb
diff --git a/test/test_pkey_dsa.rb b/test/openssl/test_pkey_dsa.rb
index 2c839b7d..2c839b7d 100644
--- a/test/test_pkey_dsa.rb
+++ b/test/openssl/test_pkey_dsa.rb
diff --git a/test/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb
index 6b83ed76..6b83ed76 100644
--- a/test/test_pkey_ec.rb
+++ b/test/openssl/test_pkey_ec.rb
diff --git a/test/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb
index a9587aa1..a9587aa1 100644
--- a/test/test_pkey_rsa.rb
+++ b/test/openssl/test_pkey_rsa.rb
diff --git a/test/test_random.rb b/test/openssl/test_random.rb
index 33af3757..33af3757 100644
--- a/test/test_random.rb
+++ b/test/openssl/test_random.rb
diff --git a/test/test_ssl.rb b/test/openssl/test_ssl.rb
index eb5b77be..eb5b77be 100644
--- a/test/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
diff --git a/test/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index 89726d44..89726d44 100644
--- a/test/test_ssl_session.rb
+++ b/test/openssl/test_ssl_session.rb
diff --git a/test/test_ts.rb b/test/openssl/test_ts.rb
index c57f08cf..c57f08cf 100644
--- a/test/test_ts.rb
+++ b/test/openssl/test_ts.rb
diff --git a/test/test_x509attr.rb b/test/openssl/test_x509attr.rb
index 2919d23d..2919d23d 100644
--- a/test/test_x509attr.rb
+++ b/test/openssl/test_x509attr.rb
diff --git a/test/test_x509cert.rb b/test/openssl/test_x509cert.rb
index ed0758a6..ed0758a6 100644
--- a/test/test_x509cert.rb
+++ b/test/openssl/test_x509cert.rb
diff --git a/test/test_x509crl.rb b/test/openssl/test_x509crl.rb
index a6d0adc5..a6d0adc5 100644
--- a/test/test_x509crl.rb
+++ b/test/openssl/test_x509crl.rb
diff --git a/test/test_x509ext.rb b/test/openssl/test_x509ext.rb
index 7ad010d1..7ad010d1 100644
--- a/test/test_x509ext.rb
+++ b/test/openssl/test_x509ext.rb
diff --git a/test/test_x509name.rb b/test/openssl/test_x509name.rb
index 4ec5db20..4ec5db20 100644
--- a/test/test_x509name.rb
+++ b/test/openssl/test_x509name.rb
diff --git a/test/test_x509req.rb b/test/openssl/test_x509req.rb
index bace06b3..bace06b3 100644
--- a/test/test_x509req.rb
+++ b/test/openssl/test_x509req.rb
diff --git a/test/test_x509store.rb b/test/openssl/test_x509store.rb
index 8223c9b7..8223c9b7 100644
--- a/test/test_x509store.rb
+++ b/test/openssl/test_x509store.rb
diff --git a/test/ut_eof.rb b/test/openssl/ut_eof.rb
index cf1f2d42..cf1f2d42 100644
--- a/test/ut_eof.rb
+++ b/test/openssl/ut_eof.rb
diff --git a/test/utils.rb b/test/openssl/utils.rb
index acece979..acece979 100644
--- a/test/utils.rb
+++ b/test/openssl/utils.rb