Merge pull request #55 from bonachea/ci-intel

Fixes for Intel oneAPI 2025

Author: bonachea

.github/workflows/build.yml

@@ -31,6 +31,19 @@ jobs:
 #            version: new
 #            container: gmao/llvm-flang:latest
 #            extra_flags: -g
+          - os: ubuntu-24.04
+            compiler: ifx
+            version: 2025.1.0
+            error_stop_code: 128
+            extra_flags: -g
+            container: intel/fortran-essentials:2025.1.0-0-devel-ubuntu24.04
+            #container: intel/oneapi-hpckit:2025.1.0-0-devel-ubuntu24.04
+          - os: ubuntu-22.04
+            compiler: ifx
+            version: 2025.0.0
+            error_stop_code: 128
+            extra_flags: -g
+            container: intel/fortran-essentials:2025.0.0-0-devel-ubuntu22.04 
 
         exclude:
           - os: ubuntu-22.04
@@ -64,9 +77,16 @@ jobs:
         set -x
         if test "$FC" = "flang" ; then \
           echo "FPM_FC=flang-new" >> "$GITHUB_ENV" ; \
+        elif test "$FC" = "ifx" ; then \
+          echo "FPM_FC=ifx" >> "$GITHUB_ENV" ; \
         else \
           echo "FPM_FC=gfortran-${GCC_VERSION}" >> "$GITHUB_ENV" ; \
         fi
+        if test -n "${{ matrix.error_stop_code }}" ; then \
+          echo "ERROR_STOP_CODE=${{ matrix.error_stop_code }}" >> "$GITHUB_ENV" ; \
+        else \
+          echo "ERROR_STOP_CODE=1" >> "$GITHUB_ENV" ; \
+        fi
 
     - name: Setup FPM
       uses: fortran-lang/setup-fpm@main
@@ -105,7 +125,7 @@ jobs:
       run: |
         set -x
                    fpm test                            ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}"
-        ( set +e ; fpm run  --example false-assertion  ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = 1 )
-        ( set +e ; fpm run  --example invoke-via-macro ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = 1 )
+        ( set +e ; fpm run  --example false-assertion  ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = $ERROR_STOP_CODE )
+        ( set +e ; fpm run  --example invoke-via-macro ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = $ERROR_STOP_CODE )
 
 

example/support-assert-test-suite/check-exit-status.f90

@@ -24,7 +24,7 @@
   module procedure assert_always
     use characterizable_m, only : characterizable_t
 
-    character(len=:), allocatable :: header, trailer
+    character(len=:), allocatable :: header, trailer, message
     integer :: me
 
       check_assertion: &
@@ -39,6 +39,7 @@
         header = 'Assertion "' // description // '" failed on image ' // string(me)
 #else
         header = 'Assertion "' // description // '" failed.'
+        me = 0 ! avoid a harmless warning
 #endif
 
         represent_diagnostics_as_string: &
@@ -68,10 +69,12 @@
 
         end if represent_diagnostics_as_string
 
+        message = header // trailer
+
 #if ASSERT_PARALLEL_CALLBACKS
-        call assert_error_stop(header // trailer)
+        call assert_error_stop(message)
 #else
-        error stop (header // trailer)
+        error stop message, QUIET=.false.
 #endif
 
       end if check_assertion

src/assert/assert_subroutine_s.F90

@@ -1,3 +1,3 @@
 #!/bin/bash
 output=$(fpm run --example false-assertion --compiler ifx --flag '-O3 -DASSERTIONS' > /dev/null 2>&1)
-echo $?
+echo $? > build/exit_status

test/run-false-assertion-intel.sh

@@ -23,7 +23,7 @@ program test_assert_subroutine_error_termination
 #elif __flang__
     command = "./test/run-false-assertion.sh", &
 #elif __INTEL_COMPILER
-    command = "./test/run-false-assertion-intel.sh | fpm run --example check-exit-status", &
+    command = "./test/run-false-assertion-intel.sh", &
 #elif _CRAYFTN
     command = "fpm run --example false-assertion --profile release --compiler crayftn.sh --flag '-DASSERTIONS' > /dev/null 2>&1", &
 #else