Engine removal: Silence the CI tests about engines

As we can't do every change in one big PR (and we also don't want),
therefore there always will be failing tests until everything is
resolved/cleaned up. This way we silence the CI about engine tests and
later we can reenable them to see what else needs to be fixed.

Resolves: https://github.com/openssl/project/issues/1371

Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28440)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 7e9396868afd62d2b2c8444a05b60337174fe67c..bef0ab3d887e0d9613f9569c3615e613e97253f2 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -694,7 +694,6 @@ my %targets = (
         shared_target    => "linux-shared",
         shared_cflag     => "-fPIC",
         shared_ldflag    => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
-        enable           => [ "afalgeng" ],
     },
     "linux-latomic" => {
         inherit_from     => [ "linux-generic32" ],
@@ -1027,7 +1026,6 @@ my %targets = (
         cflags           => threads("-pthread"),
         cppflags         => threads("-D_THREAD_SAFE -D_REENTRANT"),
         ex_libs          => add(threads("-pthread")),
-        enable           => add("devcryptoeng"),
         bn_ops           => "BN_LLONG",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",
@@ -1201,7 +1199,6 @@ my %targets = (
         cflags           => threads("-pthread"),
         cppflags         => threads("-D_THREAD_SAFE -D_REENTRANT"),
         ex_libs          => add(threads("-pthread")),
-        enable           => add("devcryptoeng"),
         bn_ops           => "BN_LLONG",
         thread_scheme    => "pthreads",
         dso_scheme       => "dlfcn",

diff --git a/Configure b/Configure
index 6cc03bf2fee725813f73329e83fcd6c5828ce2ce..5810cd967d3aff4499361d4dd347fce5f3aecd94 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -24,6 +24,14 @@ use OpenSSL::config;
 
 # see INSTALL.md for instructions.
 
+# Set this variable to 1 if you want to skip all the Engine related tests
+# Re-enable with 0. (and you also should add back 'afalgeng' in
+# Configurations/10-main.conf to the enable array at (possible) line 697
+# (targets/linux_generic32)
+# This is needed for engine removal process, because we can't do it in one big
+# bulk and otherwise there will be failing tests and we want the CI to be happy.
+my $disable_engine_removal = 1;
+
 my $orig_death_handler = $SIG{__DIE__};
 $SIG{__DIE__} = \&death_handler;
 
@@ -1830,6 +1838,14 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
                               : ( $_ ) }
                     @{$config{CFLAGS}} ];
 
+if ($disable_engine_removal == 1) {
+    disable("engine-removal", "engine");
+    disable("engine-removal", "afalgeng");
+    disable("engine-removal", "capieng");
+    disable("engine-removal", "loadereng");
+    disable("engine-removal", "padlockeng");
+}
+
 unless ($disabled{afalgeng}) {
     $config{afalgeng}="";
     if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {