fix build with fpm-deployment.sh and fypp

fortran-lang · Jan 1, 2024 · b00895a · b00895a
1 parent ad6cd9a
commit b00895a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/ci/fpm-deployment.sh b/ci/fpm-deployment.sh
@@ -9,7 +9,7 @@ destdir="${DESTDIR:-stdlib-fpm}"
 fypp="${FYPP:-$(which fypp)}"
 
 # Arguments for the fypp preprocessor
-fyflags="${FYFLAGS:--DMAXRANK=4}"
+fyflags="${FYFLAGS:--DMAXRANK=8}"
 
 # Number of parallel jobs for preprocessing
 if [ $(uname) = "Darwin" ]; then
@@ -45,6 +45,12 @@ mkdir -p "$destdir/src" "$destdir/test" "$destdir/example"
 find src -maxdepth 1 -iname "*.fypp" \
   | cut -f1 -d. | xargs -P "$njob" -I{} "$fypp" "{}.fypp" "$destdir/{}.f90" $fyflags
 
+find test -name "test_*.fypp" -exec cp {} "$destdir/test/" \;
+fyflags="${fyflags} -I src"
+find $destdir/test -maxdepth 1 -iname "*.fypp" \
+  | cut -f1 -d. | xargs -P "$njob" -I{} "$fypp" "{}.fypp" "{}.f90" $fyflags
+find $destdir/test -name "test_*.fypp" -exec rm {} \;
+
 # Collect stdlib source files
 find src -maxdepth 1 -iname "*.f90" -exec cp {} "$destdir/src/" \;
 find test -name "test_*.f90" -exec cp {} "$destdir/test/" \;

diff --git a/test/hashmaps/test_maps.fypp b/test/hashmaps/test_maps.fypp
@@ -1,3 +1,4 @@
+#: include "common.fypp"
 #:set HASH_NAME = ["fnv_1_hasher", "fnv_1a_hasher", "seeded_nmhash32_hasher", "seeded_nmhash32x_hasher", "seeded_water_hasher"]
 #:set SIZE_NAME = ["16", "256"]
 module test_stdlib_chaining_maps

diff --git a/test/string/test_string_assignment.fypp b/test/string/test_string_assignment.fypp
@@ -1,3 +1,4 @@
+#: include "common.fypp"
 ! SPDX-Identifier: MIT
 module test_string_assignment
     use testdrive, only : new_unittest, unittest_type, error_type, check

diff --git a/test/string/test_string_to_number.fypp b/test/string/test_string_to_number.fypp
@@ -1,3 +1,4 @@
+#: include "common.fypp"
 module test_string_to_number
     use stdlib_kinds, only: sp, dp, qp
     use stdlib_str2num, only: to_num