fortran-lang · jvdp1 · Jul 31, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,8 +48,31 @@ if(NOT FYPP)
   message(FATAL_ERROR "Preprocessor fypp not found! Please install fypp following the instructions in https://fypp.readthedocs.io/en/stable/fypp.html#installing")
 endif()
 
+# Custom preprocessor flags
+if(DEFINED CMAKE_MAXIMUM_RANK)
+  set(fyppFlags "-DMAXRANK=${CMAKE_MAXIMUM_RANK}")
+elseif(f03rank)
+  set(fyppFlags)
+else()
+  set(fyppFlags "-DVERSION90")
+endif()
+
+list(
+  APPEND fyppFlags
+  "-DWITH_QP=$<BOOL:${WITH_QP}>"
+  "-DWITH_XDP=$<BOOL:${WITH_XDP}>"
+  "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
+  "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
+  "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
+)
+
 add_subdirectory(src)
 
+if(BUILD_TESTING)
+  enable_testing()
+  add_subdirectory(test)
+endif()
+
 install(EXPORT ${PROJECT_NAME}-targets
         NAMESPACE ${PROJECT_NAME}::
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"

diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
@@ -20,9 +20,9 @@ This style guide is a living document and proposed changes may be adopted after
 * If the interface and implementation is split using submodules the implementation submodule file should have the same name as the
   interface (parent) module but end in `_implementation`
   E.g., `string_class.f90` and `string_class_implementation.f90`
-* Tests should be added in the `tests` subdirectory and have the same name as the module they are testing with the `test_` prefix
+* Tests should be added in the `test` subdirectory and have the same name as the module they are testing with the `test_` prefix
   added
-  E.g., `string_class.f90` and `tests/test_string_class.f90`
+  E.g., `string_class.f90` and `test/test_string_class.f90`
 
 ## Indentation & whitespace
 

diff --git a/WORKFLOW.md b/WORKFLOW.md
@@ -81,8 +81,8 @@ To add tests, the macro ``ADDTEST`` should be used instead of the CMake function
 ``add_test``, the macro hides creation of the executable target, linking against the 
 main library target and registering the test.
 The tests themselves are defined as standalone executables in the subdirectories
-in ``src/tests``, a new subdirectory with tests has to be registred in
-``src/tests/CMakeLists.txt``.
+in ``test``, a new subdirectory with tests has to be registered in
+``test/CMakeLists.txt``.
 
 The source tree should be considered read-only. References to ``PROJECT_SOURCE_DIR``
 and ``CMAKE_CURRENT_SOURCE_DIR`` should only be used for accessing source files,

diff --git a/ci/fpm-deployment.sh b/ci/fpm-deployment.sh
@@ -47,8 +47,8 @@ find src -maxdepth 1 -iname "*.fypp" \
 
 # Collect stdlib source files
 find src -maxdepth 1 -iname "*.f90" -exec cp {} "$destdir/src/" \;
-find src/tests -name "test_*.f90" -exec cp {} "$destdir/test/" \;
-find src/tests -name "*.dat" -exec cp {} "$destdir/" \;
+find test -name "test_*.f90" -exec cp {} "$destdir/test/" \;
+find test -name "*.dat" -exec cp {} "$destdir/" \;
 
 # Include additional files
 cp "${include[@]}" "$destdir/"

diff --git a/doc/specs/stdlib_hash_procedures.md b/doc/specs/stdlib_hash_procedures.md
@@ -1623,7 +1623,7 @@ various hash functions. The other is a comparison of the outputs of
 the Fortran hash functions, with the outputs of the C and C++ hash
 procedures that are the inspiration for the Fortran hash functions.
 
-In the `src/test/hash_functions_perf` subdirectory, the Fortran Standard
+In the `test/hash_functions_perf` subdirectory, the Fortran Standard
 Library provides two performance test codes for
 the hash functions of `stdlib_hash_32bit` and
 `stdlib_hash_64bit`, `test_32_bit_hash_performance` and
@@ -1726,7 +1726,7 @@ severely impact the performance of  `nmhash32`, `nmhash32x`,
 `water_hash`, `pengy_hash`, and `spooky_hash` relative to
 `fnv_1_hash` and `fnv_1a_hash`.
 
-In the `src/test/hash_functions` subdirectory, the Fortran
+In the `test/hash_functions` subdirectory, the Fortran
 Standard Library contains codes to test the validity of
 the Fortran codes against the original C and C++ codes. It consists of one
 executable `test_hash_functions` that

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -61,24 +61,6 @@ set(fppFiles
 )
 
 
-# Custom preprocessor flags
-if(DEFINED CMAKE_MAXIMUM_RANK)
-  set(fyppFlags "-DMAXRANK=${CMAKE_MAXIMUM_RANK}")
-elseif(f03rank)
-  set(fyppFlags)
-else()
-  set(fyppFlags "-DVERSION90")
-endif()
-
-list(
-  APPEND fyppFlags
-  "-DWITH_QP=$<BOOL:${WITH_QP}>"
-  "-DWITH_XDP=$<BOOL:${WITH_XDP}>"
-  "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
-  "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
-  "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
-)
-
 fypp_f90("${fyppFlags}" "${fppFiles}" outFiles)
 
 set(SRC
@@ -134,11 +116,6 @@ else()
   target_sources(${PROJECT_NAME} PRIVATE f08estop.f90)
 endif()
 
-if(BUILD_TESTING)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
-
 install(TARGETS ${PROJECT_NAME}
         EXPORT ${PROJECT_NAME}-targets
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

diff --git a/src/tests/CMakeLists.txt → test/CMakeLists.txt b/src/tests/CMakeLists.txt → test/CMakeLists.txt
diff --git a/src/tests/array/CMakeLists.txt → test/array/CMakeLists.txt b/src/tests/array/CMakeLists.txt → test/array/CMakeLists.txt
diff --git a/src/tests/array/test_logicalloc.f90 → test/array/test_logicalloc.f90 b/src/tests/array/test_logicalloc.f90 → test/array/test_logicalloc.f90
diff --git a/src/tests/ascii/CMakeLists.txt → test/ascii/CMakeLists.txt b/src/tests/ascii/CMakeLists.txt → test/ascii/CMakeLists.txt
diff --git a/src/tests/ascii/test_ascii.f90 → test/ascii/test_ascii.f90 b/src/tests/ascii/test_ascii.f90 → test/ascii/test_ascii.f90
diff --git a/src/tests/bitsets/CMakeLists.txt → test/bitsets/CMakeLists.txt b/src/tests/bitsets/CMakeLists.txt → test/bitsets/CMakeLists.txt
diff --git a/src/tests/bitsets/test_stdlib_bitset_64.f90 → test/bitsets/test_stdlib_bitset_64.f90 b/src/tests/bitsets/test_stdlib_bitset_64.f90 → test/bitsets/test_stdlib_bitset_64.f90
diff --git a/...ests/bitsets/test_stdlib_bitset_large.f90 → test/bitsets/test_stdlib_bitset_large.f90 b/...ests/bitsets/test_stdlib_bitset_large.f90 → test/bitsets/test_stdlib_bitset_large.f90
diff --git a/src/tests/hash_functions/CMakeLists.txt → test/hash_functions/CMakeLists.txt b/src/tests/hash_functions/CMakeLists.txt → test/hash_functions/CMakeLists.txt
diff --git a/src/tests/hash_functions/README.md → test/hash_functions/README.md b/src/tests/hash_functions/README.md → test/hash_functions/README.md
diff --git a/src/tests/hash_functions/SpookyV2.cpp → test/hash_functions/SpookyV2.cpp b/src/tests/hash_functions/SpookyV2.cpp → test/hash_functions/SpookyV2.cpp
diff --git a/src/tests/hash_functions/SpookyV2.h → test/hash_functions/SpookyV2.h b/src/tests/hash_functions/SpookyV2.h → test/hash_functions/SpookyV2.h
diff --git a/src/tests/hash_functions/SpookyV2Test.cpp → test/hash_functions/SpookyV2Test.cpp b/src/tests/hash_functions/SpookyV2Test.cpp → test/hash_functions/SpookyV2Test.cpp
diff --git a/...s/hash_functions/generate_hash_arrays.cpp → test/hash_functions/generate_hash_arrays.cpp b/...s/hash_functions/generate_hash_arrays.cpp → test/hash_functions/generate_hash_arrays.cpp
diff --git a/src/tests/hash_functions/nmhash.c → test/hash_functions/nmhash.c b/src/tests/hash_functions/nmhash.c → test/hash_functions/nmhash.c
diff --git a/src/tests/hash_functions/nmhash.h → test/hash_functions/nmhash.h b/src/tests/hash_functions/nmhash.h → test/hash_functions/nmhash.h
diff --git a/src/tests/hash_functions/nmhash_scalar.c → test/hash_functions/nmhash_scalar.c b/src/tests/hash_functions/nmhash_scalar.c → test/hash_functions/nmhash_scalar.c
diff --git a/src/tests/hash_functions/nmhash_scalar.h → test/hash_functions/nmhash_scalar.h b/src/tests/hash_functions/nmhash_scalar.h → test/hash_functions/nmhash_scalar.h
diff --git a/src/tests/hash_functions/pengyhash.c → test/hash_functions/pengyhash.c b/src/tests/hash_functions/pengyhash.c → test/hash_functions/pengyhash.c
diff --git a/src/tests/hash_functions/pengyhash.h → test/hash_functions/pengyhash.h b/src/tests/hash_functions/pengyhash.h → test/hash_functions/pengyhash.h
diff --git a/...ts/hash_functions/test_hash_functions.f90 → test/hash_functions/test_hash_functions.f90 b/...ts/hash_functions/test_hash_functions.f90 → test/hash_functions/test_hash_functions.f90
diff --git a/src/tests/hash_functions/waterhash.c → test/hash_functions/waterhash.c b/src/tests/hash_functions/waterhash.c → test/hash_functions/waterhash.c
diff --git a/src/tests/hash_functions/waterhash.h → test/hash_functions/waterhash.h b/src/tests/hash_functions/waterhash.h → test/hash_functions/waterhash.h
diff --git a/src/tests/hash_functions_perf/CMakeLists.txt → test/hash_functions_perf/CMakeLists.txt b/src/tests/hash_functions_perf/CMakeLists.txt → test/hash_functions_perf/CMakeLists.txt
diff --git a/...ons_perf/test_32_bit_hash_performance.f90 → ...ons_perf/test_32_bit_hash_performance.f90 b/...ons_perf/test_32_bit_hash_performance.f90 → ...ons_perf/test_32_bit_hash_performance.f90
diff --git a/...ons_perf/test_64_bit_hash_performance.f90 → ...ons_perf/test_64_bit_hash_performance.f90 b/...ons_perf/test_64_bit_hash_performance.f90 → ...ons_perf/test_64_bit_hash_performance.f90
diff --git a/src/tests/hashmaps/CMakeLists.txt → test/hashmaps/CMakeLists.txt b/src/tests/hashmaps/CMakeLists.txt → test/hashmaps/CMakeLists.txt
diff --git a/src/tests/hashmaps/Makefile.manual → test/hashmaps/Makefile.manual b/src/tests/hashmaps/Makefile.manual → test/hashmaps/Makefile.manual
diff --git a/src/tests/hashmaps/test_chaining_maps.f90 → test/hashmaps/test_chaining_maps.f90 b/src/tests/hashmaps/test_chaining_maps.f90 → test/hashmaps/test_chaining_maps.f90
diff --git a/src/tests/hashmaps/test_maps.fypp → test/hashmaps/test_maps.fypp b/src/tests/hashmaps/test_maps.fypp → test/hashmaps/test_maps.fypp
diff --git a/src/tests/hashmaps/test_open_maps.f90 → test/hashmaps/test_open_maps.f90 b/src/tests/hashmaps/test_open_maps.f90 → test/hashmaps/test_open_maps.f90
diff --git a/src/tests/io/CMakeLists.txt → test/io/CMakeLists.txt b/src/tests/io/CMakeLists.txt → test/io/CMakeLists.txt
diff --git a/src/tests/io/test_getline.f90 → test/io/test_getline.f90 b/src/tests/io/test_getline.f90 → test/io/test_getline.f90
diff --git a/src/tests/io/test_loadtxt.f90 → test/io/test_loadtxt.f90 b/src/tests/io/test_loadtxt.f90 → test/io/test_loadtxt.f90
diff --git a/src/tests/io/test_loadtxt_qp.fypp → test/io/test_loadtxt_qp.fypp b/src/tests/io/test_loadtxt_qp.fypp → test/io/test_loadtxt_qp.fypp
diff --git a/src/tests/io/test_npy.f90 → test/io/test_npy.f90 b/src/tests/io/test_npy.f90 → test/io/test_npy.f90
diff --git a/src/tests/io/test_open.f90 → test/io/test_open.f90 b/src/tests/io/test_open.f90 → test/io/test_open.f90
diff --git a/src/tests/io/test_parse_mode.f90 → test/io/test_parse_mode.f90 b/src/tests/io/test_parse_mode.f90 → test/io/test_parse_mode.f90
diff --git a/src/tests/io/test_savetxt.f90 → test/io/test_savetxt.f90 b/src/tests/io/test_savetxt.f90 → test/io/test_savetxt.f90
diff --git a/src/tests/io/test_savetxt_qp.fypp → test/io/test_savetxt_qp.fypp b/src/tests/io/test_savetxt_qp.fypp → test/io/test_savetxt_qp.fypp
diff --git a/src/tests/linalg/CMakeLists.txt → test/linalg/CMakeLists.txt b/src/tests/linalg/CMakeLists.txt → test/linalg/CMakeLists.txt
diff --git a/src/tests/linalg/test_linalg.fypp → test/linalg/test_linalg.fypp b/src/tests/linalg/test_linalg.fypp → test/linalg/test_linalg.fypp
diff --git a/...g/test_linalg_matrix_property_checks.fypp → ...g/test_linalg_matrix_property_checks.fypp b/...g/test_linalg_matrix_property_checks.fypp → ...g/test_linalg_matrix_property_checks.fypp
diff --git a/src/tests/logger/CMakeLists.txt → test/logger/CMakeLists.txt b/src/tests/logger/CMakeLists.txt → test/logger/CMakeLists.txt
diff --git a/src/tests/logger/test_stdlib_logger.f90 → test/logger/test_stdlib_logger.f90 b/src/tests/logger/test_stdlib_logger.f90 → test/logger/test_stdlib_logger.f90
diff --git a/src/tests/math/CMakeLists.txt → test/math/CMakeLists.txt b/src/tests/math/CMakeLists.txt → test/math/CMakeLists.txt
diff --git a/src/tests/math/test_linspace.f90 → test/math/test_linspace.f90 b/src/tests/math/test_linspace.f90 → test/math/test_linspace.f90
diff --git a/src/tests/math/test_logspace.f90 → test/math/test_logspace.f90 b/src/tests/math/test_logspace.f90 → test/math/test_logspace.f90
diff --git a/src/tests/math/test_stdlib_math.fypp → test/math/test_stdlib_math.fypp b/src/tests/math/test_stdlib_math.fypp → test/math/test_stdlib_math.fypp
diff --git a/src/tests/optval/CMakeLists.txt → test/optval/CMakeLists.txt b/src/tests/optval/CMakeLists.txt → test/optval/CMakeLists.txt
diff --git a/src/tests/optval/test_optval.fypp → test/optval/test_optval.fypp b/src/tests/optval/test_optval.fypp → test/optval/test_optval.fypp
diff --git a/src/tests/quadrature/CMakeLists.txt → test/quadrature/CMakeLists.txt b/src/tests/quadrature/CMakeLists.txt → test/quadrature/CMakeLists.txt
diff --git a/src/tests/quadrature/test_gauss.f90 → test/quadrature/test_gauss.f90 b/src/tests/quadrature/test_gauss.f90 → test/quadrature/test_gauss.f90
diff --git a/src/tests/quadrature/test_simps.fypp → test/quadrature/test_simps.fypp b/src/tests/quadrature/test_simps.fypp → test/quadrature/test_simps.fypp
diff --git a/src/tests/quadrature/test_trapz.fypp → test/quadrature/test_trapz.fypp b/src/tests/quadrature/test_trapz.fypp → test/quadrature/test_trapz.fypp
diff --git a/src/tests/selection/CMakeLists.txt → test/selection/CMakeLists.txt b/src/tests/selection/CMakeLists.txt → test/selection/CMakeLists.txt
diff --git a/src/tests/selection/test_selection.fypp → test/selection/test_selection.fypp b/src/tests/selection/test_selection.fypp → test/selection/test_selection.fypp
diff --git a/src/tests/sorting/CMakeLists.txt → test/sorting/CMakeLists.txt b/src/tests/sorting/CMakeLists.txt → test/sorting/CMakeLists.txt
diff --git a/src/tests/sorting/test_sorting.f90 → test/sorting/test_sorting.f90 b/src/tests/sorting/test_sorting.f90 → test/sorting/test_sorting.f90
diff --git a/src/tests/specialfunctions/CMakeLists.txt → test/specialfunctions/CMakeLists.txt b/src/tests/specialfunctions/CMakeLists.txt → test/specialfunctions/CMakeLists.txt
diff --git a/src/tests/specialfunctions/Makefile.manual → test/specialfunctions/Makefile.manual b/src/tests/specialfunctions/Makefile.manual → test/specialfunctions/Makefile.manual
diff --git a/...unctions/test_specialfunctions_gamma.fypp → ...unctions/test_specialfunctions_gamma.fypp b/...unctions/test_specialfunctions_gamma.fypp → ...unctions/test_specialfunctions_gamma.fypp
diff --git a/src/tests/stats/CMakeLists.txt → test/stats/CMakeLists.txt b/src/tests/stats/CMakeLists.txt → test/stats/CMakeLists.txt
diff --git a/src/tests/stats/array3.dat → test/stats/array3.dat b/src/tests/stats/array3.dat → test/stats/array3.dat
diff --git a/src/tests/stats/test_corr.f90 → test/stats/test_corr.f90 b/src/tests/stats/test_corr.f90 → test/stats/test_corr.f90
diff --git a/src/tests/stats/test_cov.f90 → test/stats/test_cov.f90 b/src/tests/stats/test_cov.f90 → test/stats/test_cov.f90
diff --git a/.../stats/test_distribution_exponential.fypp → .../stats/test_distribution_exponential.fypp b/.../stats/test_distribution_exponential.fypp → .../stats/test_distribution_exponential.fypp
diff --git a/...tests/stats/test_distribution_normal.fypp → test/stats/test_distribution_normal.fypp b/...tests/stats/test_distribution_normal.fypp → test/stats/test_distribution_normal.fypp
diff --git a/...ests/stats/test_distribution_uniform.fypp → test/stats/test_distribution_uniform.fypp b/...ests/stats/test_distribution_uniform.fypp → test/stats/test_distribution_uniform.fypp
diff --git a/src/tests/stats/test_mean.fypp → test/stats/test_mean.fypp b/src/tests/stats/test_mean.fypp → test/stats/test_mean.fypp
diff --git a/src/tests/stats/test_mean_f03.fypp → test/stats/test_mean_f03.fypp b/src/tests/stats/test_mean_f03.fypp → test/stats/test_mean_f03.fypp
diff --git a/src/tests/stats/test_median.fypp → test/stats/test_median.fypp b/src/tests/stats/test_median.fypp → test/stats/test_median.fypp
diff --git a/src/tests/stats/test_moment.f90 → test/stats/test_moment.f90 b/src/tests/stats/test_moment.f90 → test/stats/test_moment.f90
diff --git a/src/tests/stats/test_random.f90 → test/stats/test_random.f90 b/src/tests/stats/test_random.f90 → test/stats/test_random.f90
diff --git a/src/tests/stats/test_rawmoment.f90 → test/stats/test_rawmoment.f90 b/src/tests/stats/test_rawmoment.f90 → test/stats/test_rawmoment.f90
diff --git a/src/tests/stats/test_var.f90 → test/stats/test_var.f90 b/src/tests/stats/test_var.f90 → test/stats/test_var.f90
diff --git a/src/tests/stats/test_varn.f90 → test/stats/test_varn.f90 b/src/tests/stats/test_varn.f90 → test/stats/test_varn.f90
diff --git a/src/tests/string/CMakeLists.txt → test/string/CMakeLists.txt b/src/tests/string/CMakeLists.txt → test/string/CMakeLists.txt
diff --git a/src/tests/string/test_string_assignment.f90 → test/string/test_string_assignment.f90 b/src/tests/string/test_string_assignment.f90 → test/string/test_string_assignment.f90
diff --git a/...sts/string/test_string_derivedtype_io.f90 → test/string/test_string_derivedtype_io.f90 b/...sts/string/test_string_derivedtype_io.f90 → test/string/test_string_derivedtype_io.f90
diff --git a/src/tests/string/test_string_functions.f90 → test/string/test_string_functions.f90 b/src/tests/string/test_string_functions.f90 → test/string/test_string_functions.f90
diff --git a/src/tests/string/test_string_intrinsic.f90 → test/string/test_string_intrinsic.f90 b/src/tests/string/test_string_intrinsic.f90 → test/string/test_string_intrinsic.f90
diff --git a/src/tests/string/test_string_match.f90 → test/string/test_string_match.f90 b/src/tests/string/test_string_match.f90 → test/string/test_string_match.f90
diff --git a/src/tests/string/test_string_operator.f90 → test/string/test_string_operator.f90 b/src/tests/string/test_string_operator.f90 → test/string/test_string_operator.f90
diff --git a/src/tests/string/test_string_strip_chomp.f90 → test/string/test_string_strip_chomp.f90 b/src/tests/string/test_string_strip_chomp.f90 → test/string/test_string_strip_chomp.f90
diff --git a/src/tests/string/test_string_to_string.f90 → test/string/test_string_to_string.f90 b/src/tests/string/test_string_to_string.f90 → test/string/test_string_to_string.f90
diff --git a/src/tests/stringlist/CMakeLists.txt → test/stringlist/CMakeLists.txt b/src/tests/stringlist/CMakeLists.txt → test/stringlist/CMakeLists.txt
diff --git a/src/tests/stringlist/test_append_prepend.f90 → test/stringlist/test_append_prepend.f90 b/src/tests/stringlist/test_append_prepend.f90 → test/stringlist/test_append_prepend.f90
diff --git a/src/tests/stringlist/test_insert_at.f90 → test/stringlist/test_insert_at.f90 b/src/tests/stringlist/test_insert_at.f90 → test/stringlist/test_insert_at.f90
diff --git a/src/tests/system/CMakeLists.txt → test/system/CMakeLists.txt b/src/tests/system/CMakeLists.txt → test/system/CMakeLists.txt
diff --git a/src/tests/system/test_sleep.f90 → test/system/test_sleep.f90 b/src/tests/system/test_sleep.f90 → test/system/test_sleep.f90
diff --git a/src/tests/test_always_fail.f90 → test/test_always_fail.f90 b/src/tests/test_always_fail.f90 → test/test_always_fail.f90
diff --git a/src/tests/test_always_skip.f90 → test/test_always_skip.f90 b/src/tests/test_always_skip.f90 → test/test_always_skip.f90