Make explicit EC tests off by default

Signed-off-by: Lucas Mulling <[email protected]>

.github/workflows/build.yml

@@ -76,7 +76,11 @@ jobs:
           git config --global --add safe.directory \
               /__w/pkcs11-provider/pkcs11-provider
           git submodule update --init
-          CC=${{ matrix.compiler }} meson setup builddir
+          if [ -f /etc/fedora-release ]; then
+            CC=${{ matrix.compiler }} meson setup builddir
+          else
+            CC=${{ matrix.compiler }} meson setup builddir -Denable_explicit_EC_test=true
+          fi
       - name: Build and Test
         if : ( steps.nss-version-check.outputs.skiptest != 'true' )
         run: |

meson_options.txt

@@ -3,7 +3,7 @@ option('preload_libasan',
        value: 'no',
        description: 'Path to libasan.so to preload')
 
-option('disable_explicit_EC_test',
+option('enable_explicit_EC_test',
        type: 'boolean',
        value: false,
-       description: 'Disable explicit EC tests')
+       description: 'Enable explicit EC tests')

tests/meson.build

@@ -30,8 +30,8 @@ if nss_softokn.found()
   endif
 endif
 
-if get_option('disable_explicit_EC_test')
-  conf_env.set('DISABLE_EXPLICIT_EC_TEST', '1')
+if get_option('enable_explicit_EC_test')
+  conf_env.set('ENABLE_EXPLICIT_EC_TEST', '1')
 endif
 
 setup_script=find_program('setup.sh')
@@ -51,8 +51,8 @@ test_env = environment({
   'TESTBLDDIR': meson.current_build_dir(),
 })
 
-if get_option('disable_explicit_EC_test')
-  test_env.set('DISABLE_EXPLICIT_EC_TEST', '1')
+if get_option('enable_explicit_EC_test')
+  test_env.set('ENABLE_EXPLICIT_EC_TEST', '1')
 endif
 
 valgrind = find_program('valgrind', required: false)

tests/setup.sh

@@ -305,7 +305,7 @@ echo "${ECPRI2URI}"
 echo "${ECCRT2URI}"
 echo ""
 
-if [ -n "${DISABLE_EXPLICIT_EC_TEST}" ]; then
+if [ -z "${ENABLE_EXPLICIT_EC_TEST}" ]; then
     title PARA "explicit EC unsupported"
 elif [ "${TOKENTYPE}" == "softokn" ]; then
     title PARA "explicit EC unsupported with softokn"

tests/tecxc

@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Some distributions completely removed support for explicit EC from libcrypto.
-# If `-Ddisable_explicit_EC_test=true` is set, skip the test.
-if [ -n "${DISABLE_EXPLICIT_EC_TEST}" ]; then
+# If `-Denable_explicit_EC_test=true` is not set, skip the test.
+if [ -z "${ENABLE_EXPLICIT_EC_TEST}" ]; then
     exit 0
 fi