fix build and runtime issues with hash tests usinc c/c++ (fortran-lang#988)

Author: github-actions[bot]

src/stdlib_strings.fypp

@@ -302,12 +302,21 @@ contains
 
         last = len(string)
         nsub = len(substring)
-        if (nsub > 0) then
-            do while(string(last-nsub+1:last) == substring)
-                last = last - nsub
+        if (nsub > 0 .and. nsub <= last) then
+            do while(last >= nsub)
+                if (string(last-nsub+1:last) == substring) then
+                    last = last - nsub
+                else
+                    exit
+                end if
             end do
         end if
-        chomped_string = string(1:last)
+
+        if (last <= 0) then
+            chomped_string = ''
+        else
+            chomped_string = string(1:last)
+        end if        
 
     end function chomp_substring_char_char
 

test/CMakeLists.txt

@@ -2,6 +2,14 @@ if (NOT TARGET "test-drive::test-drive")
   find_package("test-drive" REQUIRED)
 endif()
 
+if(WIN32)
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
+    add_link_options(/Qoption,link,/STACK:8388608)
+  elseif(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
+    add_link_options(-Wl,--stack,8388608)
+  endif()
+endif()
+
 macro(ADDTEST name)
     add_executable(test_${name} test_${name}.f90)
     target_link_libraries(test_${name} "${PROJECT_NAME}" "test-drive::test-drive")

test/hash_functions/CMakeLists.txt

@@ -23,6 +23,21 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
   set(CMAKE_CXX_EXTENSIONS OFF)
 
   set_target_properties(test_hash_functions PROPERTIES LINKER_LANGUAGE Fortran)
+  
+  if(WIN32)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL$<$<CONFIG:Debug>:Debug>")
+    target_compile_options(
+      test_hash_functions
+      PRIVATE
+      $<$<COMPILE_LANGUAGE:Fortran>:/libs:dll> )
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR "RelWithDebInfo")
+      target_link_options(test_hash_functions
+        PRIVATE
+        /Qoption,link,/NODEFAULTLIB:libcmt
+        /Qoption,link,/NODEFAULTLIB:msvcrt.lib
+        /Qoption,link,/NODEFAULTLIB:libifcoremt.lib )
+    endif()
+  endif()
 endif()
 
 if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10.0)

test/string/test_string_strip_chomp.f90

@@ -151,6 +151,8 @@ subroutine test_chomp_substring_char(error)
         call check(error, chomp("hellooooo", "oo") == "hello")
         if (allocated(error)) return
         call check(error, chomp("hellooooo", substring="oo") == "hello")
+        if (allocated(error)) return
+        call check(error, chomp("helhel", substring="hel") == "")
     end subroutine test_chomp_substring_char
 
     subroutine test_chomp_substring_string(error)