From: Dmitry Belyavskiy <beldmit@users.noreply.github.com>
Date: Tue, 26 Jun 2018 19:40:19 +0000 (+0300)
Subject: Merge pull request #64 from chipitsine/modernize_ci
X-Git-Tag: v3.0.0~417^2~1
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=af0cdae35ebe75209d45928404141d37ffd684ef;hp=3461793cc682c3336292696ded27f117849bcef0;p=openssl-gost%2Fengine.git

Merge pull request #64 from chipitsine/modernize_ci

modernize ci
---

diff --git a/test/00-engine.t b/test/00-engine.t
index 35b5f92..a3d1037 100644
--- a/test/00-engine.t
+++ b/test/00-engine.t
@@ -8,8 +8,10 @@ open F,">","testdata.dat";
 print F "12345670" x 128;
 close F;
 
-# Set OPENSSL_ENGINES environment variable to just build engine
-$ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+# Set OPENSSL_ENGINES environment variable to just built engine
+if(!defined $ENV{'OPENSSL_ENGINES'}){
+	$ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+}
 
 $key='0123456789abcdef' x 2;
 
@@ -38,7 +40,7 @@ if ( -f $engine . ".info") {
 
 $engine_info= <<EOINF;
 (gost) Reference implementation of GOST engine
- [gost89, gost89-cnt, gost89-cnt-12, gost89-cbc, md_gost94, gost-mac, md_gost12_256, md_gost12_512, gost-mac-12, gost2001, gost-mac, gost2012_256, gost2012_512, gost-mac-12]
+ [gost89, gost89-cnt, gost89-cnt-12, gost89-cbc, grasshopper-ecb, grasshopper-cbc, grasshopper-cfb, grasshopper-ofb, grasshopper-ctr, md_gost94, gost-mac, md_gost12_256, md_gost12_512, gost-mac-12, gost2001, gost-mac, gost2012_256, gost2012_512, gost-mac-12]
 EOINF
 }
 
diff --git a/test/01-digest.t b/test/01-digest.t
index cea8358..3838fd2 100644
--- a/test/01-digest.t
+++ b/test/01-digest.t
@@ -2,8 +2,10 @@
 use Test::More tests => 16;
 use Cwd 'abs_path';
 
-# Set OPENSSL_ENGINES environment variable to just build engine
-$ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+# Set OPENSSL_ENGINES environment variable to just built engine
+if(!defined $ENV{'OPENSSL_ENGINES'}){
+        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+}
 # Set engine name from environment to allow testing of different engines
 $engine=$ENV{'ENGINE_NAME'}||"gost";
 # Reopen STDERR to eliminate extra output
diff --git a/test/02-mac.t b/test/02-mac.t
index 185bac1..5713dca 100644
--- a/test/02-mac.t
+++ b/test/02-mac.t
@@ -11,8 +11,10 @@ close F;
 open F,">","testbig.dat";
 print F ("12345670" x 8 . "\n") x  4096;
 close F;
-# Set OPENSSL_ENGINES environment variable to just build engine
-$ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+# Set OPENSSL_ENGINES environment variable to just built engine
+if(!defined $ENV{'OPENSSL_ENGINES'}){
+        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+}
 
 $key='0123456789abcdef' x 2;
 
diff --git a/test/03-encrypt.t b/test/03-encrypt.t
index 9cada34..d5b56c4 100644
--- a/test/03-encrypt.t
+++ b/test/03-encrypt.t
@@ -11,8 +11,10 @@ $use_config = 1;
 # prepare data for 
 
 
-# Set OPENSSL_ENGINES environment variable to just build engine
-$ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+# Set OPENSSL_ENGINES environment variable to just built engine
+if(!defined $ENV{'OPENSSL_ENGINES'}){
+        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+}
 
 $key='0123456789abcdef' x 2;
 
diff --git a/test/04-pkey.t b/test/04-pkey.t
index bd4a94f..84ae81e 100644
--- a/test/04-pkey.t
+++ b/test/04-pkey.t
@@ -11,8 +11,10 @@ $use_config = 1;
 # prepare data for 
 
 
-# Set OPENSSL_ENGINES environment variable to just build engine
-$ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+# Set OPENSSL_ENGINES environment variable to just built engine
+if(!defined $ENV{'OPENSSL_ENGINES'}){
+        $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
+}
 
 $engine=$ENV{'ENGINE_NAME'}||"gost";