Merge pull request #244 from bonachea/2025-07-misc

Misc tweaks

Author: bonachea

install.sh

@@ -441,10 +441,15 @@ exit_if_pkg_config_pc_file_missing "caffeine"
 user_compiler_flags="${CPPFLAGS:-} ${FFLAGS:-}"
 
 compiler_version=$($FPM_FC --version)
-if [[ $compiler_version == *flang* ]]; then
+if [[ $compiler_version =~ 'flang' ]]; then
   compiler_flag="-g -O3"
-else # assume gfortran
+elif [[ $compiler_version =~ 'GNU Fortran' ]]; then
   compiler_flag="-g -O3 -ffree-line-length-0 -Wno-unused-dummy-argument"
+elif [[ $compiler_version =~ 'LFortran' ]]; then
+  compiler_flag="-g -O3 --cpp"
+else # unknown compiler
+  compiler_flag="-g -O2"
+  echo "WARNING: Failed to detect a recognized Fortran compiler"
 fi
 compiler_flag+=" -DASSERT_MULTI_IMAGE -DASSERT_PARALLEL_CALLBACKS"
 

manifest/fpm.toml.template

@@ -6,7 +6,7 @@ maintainer = "[email protected]"
 copyright = "2021-2025 The Regents of the University of California, through Lawrence Berkeley National Laboratory"
 
 [dev-dependencies]
-assert = {git = "https://github.com/berkeleylab/assert.git", tag = "2.1.2"}
+assert = {git = "https://github.com/berkeleylab/assert.git", tag = "3.0.0"}
 veggies = {git = "https://gitlab.com/everythingfunctional/veggies", tag = "v1.1.3"}
 iso_varying_string = {git = "https://gitlab.com/everythingfunctional/iso_varying_string.git", tag = "v3.0.4"}
 

src/caffeine/unit_test_parameters_m.F90

@@ -1,16 +1,15 @@
 ! Copyright (c), The Regents of the University
 ! Terms of use are as specified in LICENSE.txt
 module unit_test_parameters_m
+  use iso_c_binding, only: c_int
   use prif, only: prif_sync_all, prif_this_image_no_coarray
   !! Define values and utilities for consistent use throughout the test suite
   implicit none
 
   public
 
-  enum, bind(C)
-    enumerator :: expected_stop_code=99, expected_error_stop_code
+  integer(c_int), parameter :: expected_stop_code=99, expected_error_stop_code=100
       ! used in stop/error-stop unit tests and example/test-support supporting programs
-  end enum
 
   character(len=:), allocatable :: subjob_prefix