diff --git a/.github/workflows/futs_windows.yml b/.github/workflows/futs_windows.yml index abd1ce3..2968655 100644 --- a/.github/workflows/futs_windows.yml +++ b/.github/workflows/futs_windows.yml @@ -20,7 +20,7 @@ jobs: run: | choco upgrade mingw --version="'16.1.0'" -y choco install -y make - cmake -G "Unix Makefiles" -DCMAKE_Fortran_FLAGS="-fmodule-private" -Bbuild -DBUILD_TESTS=ON + cmake -G "Unix Makefiles" -Bbuild -DBUILD_TESTS=ON cmake --build build ./build/FortUTF_Tests.exe diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ce6d65..018941a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ endif() if(BUILD_TESTS) if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") - set(CMAKE_Fortran_FLAGS "-Wall -Wextra -Wno-compare-reals -Wno-maybe-uninitialized -Wno-uninitialized -O3 -g -fprofile-arcs -ftest-coverage") + set(CMAKE_Fortran_FLAGS "-Wall -Wextra -Wno-compare-reals -Wno-maybe-uninitialized -Wno-uninitialized -O3 -g -fprofile-arcs -ftest-coverage -fmodule-private") elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") set(CMAKE_Fortran_FLAGS "-O3") endif() diff --git a/examples/demo_project/src/demo_functions.f90 b/examples/demo_project/src/demo_functions.f90 index 5a7ad53..ea5df7f 100644 --- a/examples/demo_project/src/demo_functions.f90 +++ b/examples/demo_project/src/demo_functions.f90 @@ -1,5 +1,8 @@ MODULE DEMO_FUNCTIONS IMPLICIT NONE + PRIVATE + + PUBLIC :: DEMO_FUNC_1, DEMO_FUNC_2, DEMO_FUNC_3, DEMO_FUNC_4 INTEGER, PARAMETER :: REAL_KIND_8BYTE = SELECTED_REAL_KIND(15, 307) diff --git a/examples/demo_project/tests/test_functions.f90 b/examples/demo_project/tests/test_functions.f90 index 24ccd99..09c9f74 100644 --- a/examples/demo_project/tests/test_functions.f90 +++ b/examples/demo_project/tests/test_functions.f90 @@ -1,6 +1,7 @@ MODULE TEST_DEMO_FUNCTIONS USE FORTUTF USE DEMO_FUNCTIONS + PUBLIC CONTAINS SUBROUTINE TEST_DEMO_FUNC_1 diff --git a/src/test_suite.f90 b/src/test_suite.f90 index 9f5818a..3d93254 100644 --- a/src/test_suite.f90 +++ b/src/test_suite.f90 @@ -4,4 +4,20 @@ MODULE FORTUTF USE FTF_STRING_CHECK USE FUTF_SUITE USE FUTF_UTILITIES + IMPLICIT NONE + PRIVATE + + PUBLIC :: ASSERT_EQUAL, ASSERT_ALMOST_EQUAL, ASSERT_TRUE, ASSERT_FALSE, & + & ASSERT_NOT_EQUAL, ASSERT_LESS_THAN, ASSERT_LESS_THAN_EQUAL, & + & ASSERT_GREATER_THAN, ASSERT_GREATER_THAN_EQUAL, ASSERT_IS_INT, & + & ASSERT_IS_REAL, ASSERT_IS_CHARACTER, ASSERT_IS_COMPLEX, & + & ASSERT_ARRAY_CONTAINS, INT_KIND_1BYTE, INT_KIND_2BYTE, & + & INT_KIND_4BYTE, INT_KIND_8BYTE, REAL_KIND_4BYTE, REAL_KIND_8BYTE + PUBLIC :: FAIL, SUCCEED + PUBLIC :: STRING_CONTAINS, STRING_HAS_SUFFIX, STRING_HAS_PREFIX + PUBLIC :: FUTF_PASSED, FUTF_TOTAL, FUTF_EXIT_CODE, IDENTIFIER, TEST_NAMES, & + & TEST_RESULTS, INFO_STRINGS, TAG_TEST, REGISTER_PASSED, & + & REGISTER_FAILED, TEST_SUMMARY, FAILED_TEST_SUMMARY, & + & RESET_LAST_TEST_STATUS + PUBLIC :: APPEND_CHAR, APPEND_INT, GET_INDEX_STRARRAY END MODULE FORTUTF