From d7bd2efbc4ffeb56cc1f9ddafffc49a8e42d09c2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 14:20:53 -0400 Subject: [PATCH 1/4] Tests: Remove trailing line from Fortran/External --- Tests/Fortran/External/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Tests/Fortran/External/CMakeLists.txt b/Tests/Fortran/External/CMakeLists.txt index 0eb1cfeed..c90a0ffbe 100644 --- a/Tests/Fortran/External/CMakeLists.txt +++ b/Tests/Fortran/External/CMakeLists.txt @@ -1,4 +1,3 @@ project(ExtFort Fortran) add_library(myext a.f90) - From 1ec5097d4d15cfb2d24a8f23cb6accf38f870981 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 14:21:21 -0400 Subject: [PATCH 2/4] Tests: Use more generic variables in Fortran test --- Tests/Fortran/CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index 99fcc0a6d..3105d139e 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -67,7 +67,7 @@ function(test_fortran_c_interface_module) SYMBOL_NAMESPACE "F_" SYMBOLS ${FORTRAN_FUNCTIONS} ) - include_directories("${testf_BINARY_DIR}") + include_directories("${CMAKE_CURRENT_BINARY_DIR}") # if the name mangling is not found for a F90 compiler # print out some diagnostic stuff for the dashboard @@ -111,7 +111,7 @@ function(test_fortran_c_interface_module) target_link_libraries(maincxx mycxx) # print out some stuff to help debug on machines via cdash - file(READ "${testf_BINARY_DIR}/foo.h" fooh) + file(READ "${CMAKE_CURRENT_BINARY_DIR}/foo.h" fooh) message("foo.h contents:\n${fooh}") endfunction() @@ -167,7 +167,7 @@ if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) in_interface/module.f90) add_definitions(-DFOO -DBAR=1) - include_directories(${testf_SOURCE_DIR}/include) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) add_executable(test_preprocess test_preprocess.F90 test_preprocess_module.F90) set(TEST_MODULE_DEPENDS 1) @@ -183,15 +183,15 @@ if(TEST_MODULE_DEPENDS) set(External_CONFIG_TYPE) set(External_BUILD_TYPE -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) endif() - set(External_SOURCE_DIR "${testf_SOURCE_DIR}/External") - set(External_BINARY_DIR "${testf_BINARY_DIR}/External") - if("${testf_BINARY_DIR}" MATCHES " ") + set(External_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/External") + set(External_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/External") + if("${CMAKE_CURRENT_BINARY_DIR}" MATCHES " ") # Our build tree has a space, so the build tool supports spaces. # Test using modules from a path with spaces. string(APPEND External_BINARY_DIR " Build") endif() add_custom_command( - OUTPUT ${testf_BINARY_DIR}/ExternalProject + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ExternalProject COMMAND ${CMAKE_CTEST_COMMAND} ARGS ${External_CONFIG_TYPE} --build-and-test @@ -213,13 +213,13 @@ if(TEST_MODULE_DEPENDS) ${External_BUILD_TYPE} VERBATIM ) - add_custom_target(ExternalTarget ALL DEPENDS ${testf_BINARY_DIR}/ExternalProject) + add_custom_target(ExternalTarget ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ExternalProject) # Test module output directory if available. if(CMAKE_Fortran_MODDIR_FLAG) - set(Library_MODDIR "${testf_BINARY_DIR}/Library/modules") + set(Library_MODDIR "${CMAKE_CURRENT_BINARY_DIR}/Library/modules") else() - set(Library_MODDIR "${testf_BINARY_DIR}/Library") + set(Library_MODDIR "${CMAKE_CURRENT_BINARY_DIR}/Library") endif() add_subdirectory(Library) From a41c8724d155f1cd74ce36cdfbd10da0eac5b389 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 14:09:52 -0400 Subject: [PATCH 3/4] Tests: Check if Fortran compiler supports F90 --- Tests/CheckFortran.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tests/CheckFortran.cmake b/Tests/CheckFortran.cmake index ebbb426ce..678bb82e6 100644 --- a/Tests/CheckFortran.cmake +++ b/Tests/CheckFortran.cmake @@ -22,6 +22,7 @@ project(CheckFortran Fortran) file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\" \"set(CMAKE_Fortran_COMPILER \\\"\${CMAKE_Fortran_COMPILER}\\\")\\n\" \"set(CMAKE_Fortran_FLAGS \\\"\${CMAKE_Fortran_FLAGS}\\\")\\n\" + \"set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 \\\"\${CMAKE_Fortran_COMPILER_SUPPORTS_F90}\\\")\\n\" ) ") execute_process( @@ -47,4 +48,6 @@ file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\" mark_as_advanced(CMAKE_Fortran_COMPILER) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}" CACHE STRING "Fortran flags") mark_as_advanced(CMAKE_Fortran_FLAGS) + set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "${CMAKE_Fortran_COMPILER_SUPPORTS_F90}" CACHE BOOL "Fortran compiler supports F90") + mark_as_advanced(CMAKE_Fortran_COMPILER_SUPPORTS_F90) endif() From eb8cd35684f2dc2f53d205d7738e1c01a12a493f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 22 Sep 2016 14:23:39 -0400 Subject: [PATCH 4/4] Tests: Split Fortran module testing into separate FortranModules test The main Fortran test is not granular enough. Split some into another test. --- Tests/CMakeLists.txt | 14 ++- Tests/Fortran/CMakeLists.txt | 85 ------------------- Tests/FortranModules/CMakeLists.txt | 78 +++++++++++++++++ .../Executable/CMakeLists.txt | 0 .../Executable/main.f90 | 0 .../External/CMakeLists.txt | 0 .../External/a.f90 | 0 .../Library/CMakeLists.txt | 0 .../{Fortran => FortranModules}/Library/a.f90 | 0 .../{Fortran => FortranModules}/Library/b.f90 | 0 .../Library/main.f90 | 0 .../Subdir/CMakeLists.txt | 0 .../Subdir/subdir.f90 | 0 .../in_interface/main.f90 | 0 .../in_interface/module.f90 | 0 .../include/test_preprocess.h | 0 .../test_module_implementation.f90 | 0 .../test_module_interface.f90 | 0 .../test_module_main.f90 | 0 .../test_preprocess.F90 | 0 .../test_preprocess_module.F90 | 0 .../test_use_in_comment_fixedform.f | 0 .../test_use_in_comment_freeform.f90 | 0 23 files changed, 91 insertions(+), 86 deletions(-) create mode 100644 Tests/FortranModules/CMakeLists.txt rename Tests/{Fortran => FortranModules}/Executable/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/Executable/main.f90 (100%) rename Tests/{Fortran => FortranModules}/External/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/External/a.f90 (100%) rename Tests/{Fortran => FortranModules}/Library/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/Library/a.f90 (100%) rename Tests/{Fortran => FortranModules}/Library/b.f90 (100%) rename Tests/{Fortran => FortranModules}/Library/main.f90 (100%) rename Tests/{Fortran => FortranModules}/Subdir/CMakeLists.txt (100%) rename Tests/{Fortran => FortranModules}/Subdir/subdir.f90 (100%) rename Tests/{Fortran => FortranModules}/in_interface/main.f90 (100%) rename Tests/{Fortran => FortranModules}/in_interface/module.f90 (100%) rename Tests/{Fortran => FortranModules}/include/test_preprocess.h (100%) rename Tests/{Fortran => FortranModules}/test_module_implementation.f90 (100%) rename Tests/{Fortran => FortranModules}/test_module_interface.f90 (100%) rename Tests/{Fortran => FortranModules}/test_module_main.f90 (100%) rename Tests/{Fortran => FortranModules}/test_preprocess.F90 (100%) rename Tests/{Fortran => FortranModules}/test_preprocess_module.F90 (100%) rename Tests/{Fortran => FortranModules}/test_use_in_comment_fixedform.f (100%) rename Tests/{Fortran => FortranModules}/test_use_in_comment_freeform.f90 (100%) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 8cf1faadf..235e38a23 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3097,10 +3097,22 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release --build-project testf --build-two-config --build-options ${build_options} - -DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM} --test-command testf) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Fortran") + if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) + add_test(FortranModules ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/FortranModules" + "${CMake_BINARY_DIR}/Tests/FortranModules" + ${build_generator_args} + --build-project FortranModules + --build-options ${build_options} + -DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM} + ) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranModules") + endif() + # FortranCInterface tests. if(UNIX) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FortranC/Flags.cmake.in diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index 3105d139e..740e6f594 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -1,8 +1,5 @@ cmake_minimum_required (VERSION 3.1) project(testf C CXX Fortran) -if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") - set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}") -endif() message("CTEST_FULL_OUTPUT ") set(CMAKE_VERBOSE_MAKEFILE 1) @@ -144,85 +141,3 @@ else() endif() endif() - - - - -set(TEST_MODULE_DEPENDS 0) -if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) - add_executable(test_module - test_module_main.f90 - test_module_implementation.f90 - test_module_interface.f90) - - add_executable(test_use_in_comment_fixedform - test_use_in_comment_fixedform.f) - set_property(SOURCE test_use_in_comment_fixedform.f PROPERTY Fortran_FORMAT FIXED) - add_executable(test_use_in_comment_freeform - test_use_in_comment_freeform.f90) - set_property(SOURCE test_use_in_comment_freeform.f90 PROPERTY Fortran_FORMAT FREE) - - add_executable(test_in_interface - in_interface/main.f90 - in_interface/module.f90) - - add_definitions(-DFOO -DBAR=1) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - add_executable(test_preprocess test_preprocess.F90 test_preprocess_module.F90) - - set(TEST_MODULE_DEPENDS 1) -endif() - -if(TEST_MODULE_DEPENDS) - # Build the external project separately using a custom target. - # Make sure it uses the same build configuration as this test. - if(CMAKE_CONFIGURATION_TYPES) - set(External_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}") - set(External_BUILD_TYPE) - else() - set(External_CONFIG_TYPE) - set(External_BUILD_TYPE -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) - endif() - set(External_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/External") - set(External_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/External") - if("${CMAKE_CURRENT_BINARY_DIR}" MATCHES " ") - # Our build tree has a space, so the build tool supports spaces. - # Test using modules from a path with spaces. - string(APPEND External_BINARY_DIR " Build") - endif() - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ExternalProject - COMMAND ${CMAKE_CTEST_COMMAND} - ARGS ${External_CONFIG_TYPE} - --build-and-test - ${External_SOURCE_DIR} - ${External_BINARY_DIR} - --build-noclean - --build-two-config - --build-project ExtFort - --build-generator ${CMAKE_GENERATOR} - --build-generator-platform "${CMAKE_GENERATOR_PLATFORM}" - --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}" - --build-options -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER} - -DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS} - -DCMAKE_Fortran_FLAGS_DEBUG:STRING=${CMAKE_Fortran_FLAGS_DEBUG} - -DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE} - -DCMAKE_Fortran_FLAGS_MINSIZEREL:STRING=${CMAKE_Fortran_FLAGS_MINSIZEREL} - -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_Fortran_FLAGS_RELWITHDEBINFO} - -DCMAKE_MAKE_PROGRAM:FILEPATH=${CMake_TEST_NESTED_MAKE_PROGRAM} - ${External_BUILD_TYPE} - VERBATIM - ) - add_custom_target(ExternalTarget ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ExternalProject) - - # Test module output directory if available. - if(CMAKE_Fortran_MODDIR_FLAG) - set(Library_MODDIR "${CMAKE_CURRENT_BINARY_DIR}/Library/modules") - else() - set(Library_MODDIR "${CMAKE_CURRENT_BINARY_DIR}/Library") - endif() - - add_subdirectory(Library) - add_subdirectory(Subdir) - add_subdirectory(Executable) -endif() diff --git a/Tests/FortranModules/CMakeLists.txt b/Tests/FortranModules/CMakeLists.txt new file mode 100644 index 000000000..b406df3d7 --- /dev/null +++ b/Tests/FortranModules/CMakeLists.txt @@ -0,0 +1,78 @@ +cmake_minimum_required (VERSION 3.1) +project(FortranModules Fortran) + +if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() + +add_executable(test_module + test_module_main.f90 + test_module_implementation.f90 + test_module_interface.f90) + +add_executable(test_use_in_comment_fixedform + test_use_in_comment_fixedform.f) +set_property(SOURCE test_use_in_comment_fixedform.f PROPERTY Fortran_FORMAT FIXED) +add_executable(test_use_in_comment_freeform + test_use_in_comment_freeform.f90) +set_property(SOURCE test_use_in_comment_freeform.f90 PROPERTY Fortran_FORMAT FREE) + +add_executable(test_in_interface + in_interface/main.f90 + in_interface/module.f90) + +add_definitions(-DFOO -DBAR=1) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +add_executable(test_preprocess test_preprocess.F90 test_preprocess_module.F90) + +# Build the external project separately using a custom target. +# Make sure it uses the same build configuration as this test. +if(CMAKE_CONFIGURATION_TYPES) + set(External_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}") + set(External_BUILD_TYPE) +else() + set(External_CONFIG_TYPE) + set(External_BUILD_TYPE -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) +endif() +set(External_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/External") +set(External_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/External") +if("${CMAKE_CURRENT_BINARY_DIR}" MATCHES " ") + # Our build tree has a space, so the build tool supports spaces. + # Test using modules from a path with spaces. + string(APPEND External_BINARY_DIR " Build") +endif() +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ExternalProject + COMMAND ${CMAKE_CTEST_COMMAND} + ARGS ${External_CONFIG_TYPE} + --build-and-test + ${External_SOURCE_DIR} + ${External_BINARY_DIR} + --build-noclean + --build-two-config + --build-project ExtFort + --build-generator ${CMAKE_GENERATOR} + --build-generator-platform "${CMAKE_GENERATOR_PLATFORM}" + --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}" + --build-options -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER} + -DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS} + -DCMAKE_Fortran_FLAGS_DEBUG:STRING=${CMAKE_Fortran_FLAGS_DEBUG} + -DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE} + -DCMAKE_Fortran_FLAGS_MINSIZEREL:STRING=${CMAKE_Fortran_FLAGS_MINSIZEREL} + -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_Fortran_FLAGS_RELWITHDEBINFO} + -DCMAKE_MAKE_PROGRAM:FILEPATH=${CMake_TEST_NESTED_MAKE_PROGRAM} + ${External_BUILD_TYPE} + VERBATIM + ) +add_custom_target(ExternalTarget ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ExternalProject) + +# Test module output directory if available. +if(CMAKE_Fortran_MODDIR_FLAG) + set(Library_MODDIR "${CMAKE_CURRENT_BINARY_DIR}/Library/modules") +else() + set(Library_MODDIR "${CMAKE_CURRENT_BINARY_DIR}/Library") +endif() + +add_subdirectory(Library) +add_subdirectory(Subdir) +add_subdirectory(Executable) diff --git a/Tests/Fortran/Executable/CMakeLists.txt b/Tests/FortranModules/Executable/CMakeLists.txt similarity index 100% rename from Tests/Fortran/Executable/CMakeLists.txt rename to Tests/FortranModules/Executable/CMakeLists.txt diff --git a/Tests/Fortran/Executable/main.f90 b/Tests/FortranModules/Executable/main.f90 similarity index 100% rename from Tests/Fortran/Executable/main.f90 rename to Tests/FortranModules/Executable/main.f90 diff --git a/Tests/Fortran/External/CMakeLists.txt b/Tests/FortranModules/External/CMakeLists.txt similarity index 100% rename from Tests/Fortran/External/CMakeLists.txt rename to Tests/FortranModules/External/CMakeLists.txt diff --git a/Tests/Fortran/External/a.f90 b/Tests/FortranModules/External/a.f90 similarity index 100% rename from Tests/Fortran/External/a.f90 rename to Tests/FortranModules/External/a.f90 diff --git a/Tests/Fortran/Library/CMakeLists.txt b/Tests/FortranModules/Library/CMakeLists.txt similarity index 100% rename from Tests/Fortran/Library/CMakeLists.txt rename to Tests/FortranModules/Library/CMakeLists.txt diff --git a/Tests/Fortran/Library/a.f90 b/Tests/FortranModules/Library/a.f90 similarity index 100% rename from Tests/Fortran/Library/a.f90 rename to Tests/FortranModules/Library/a.f90 diff --git a/Tests/Fortran/Library/b.f90 b/Tests/FortranModules/Library/b.f90 similarity index 100% rename from Tests/Fortran/Library/b.f90 rename to Tests/FortranModules/Library/b.f90 diff --git a/Tests/Fortran/Library/main.f90 b/Tests/FortranModules/Library/main.f90 similarity index 100% rename from Tests/Fortran/Library/main.f90 rename to Tests/FortranModules/Library/main.f90 diff --git a/Tests/Fortran/Subdir/CMakeLists.txt b/Tests/FortranModules/Subdir/CMakeLists.txt similarity index 100% rename from Tests/Fortran/Subdir/CMakeLists.txt rename to Tests/FortranModules/Subdir/CMakeLists.txt diff --git a/Tests/Fortran/Subdir/subdir.f90 b/Tests/FortranModules/Subdir/subdir.f90 similarity index 100% rename from Tests/Fortran/Subdir/subdir.f90 rename to Tests/FortranModules/Subdir/subdir.f90 diff --git a/Tests/Fortran/in_interface/main.f90 b/Tests/FortranModules/in_interface/main.f90 similarity index 100% rename from Tests/Fortran/in_interface/main.f90 rename to Tests/FortranModules/in_interface/main.f90 diff --git a/Tests/Fortran/in_interface/module.f90 b/Tests/FortranModules/in_interface/module.f90 similarity index 100% rename from Tests/Fortran/in_interface/module.f90 rename to Tests/FortranModules/in_interface/module.f90 diff --git a/Tests/Fortran/include/test_preprocess.h b/Tests/FortranModules/include/test_preprocess.h similarity index 100% rename from Tests/Fortran/include/test_preprocess.h rename to Tests/FortranModules/include/test_preprocess.h diff --git a/Tests/Fortran/test_module_implementation.f90 b/Tests/FortranModules/test_module_implementation.f90 similarity index 100% rename from Tests/Fortran/test_module_implementation.f90 rename to Tests/FortranModules/test_module_implementation.f90 diff --git a/Tests/Fortran/test_module_interface.f90 b/Tests/FortranModules/test_module_interface.f90 similarity index 100% rename from Tests/Fortran/test_module_interface.f90 rename to Tests/FortranModules/test_module_interface.f90 diff --git a/Tests/Fortran/test_module_main.f90 b/Tests/FortranModules/test_module_main.f90 similarity index 100% rename from Tests/Fortran/test_module_main.f90 rename to Tests/FortranModules/test_module_main.f90 diff --git a/Tests/Fortran/test_preprocess.F90 b/Tests/FortranModules/test_preprocess.F90 similarity index 100% rename from Tests/Fortran/test_preprocess.F90 rename to Tests/FortranModules/test_preprocess.F90 diff --git a/Tests/Fortran/test_preprocess_module.F90 b/Tests/FortranModules/test_preprocess_module.F90 similarity index 100% rename from Tests/Fortran/test_preprocess_module.F90 rename to Tests/FortranModules/test_preprocess_module.F90 diff --git a/Tests/Fortran/test_use_in_comment_fixedform.f b/Tests/FortranModules/test_use_in_comment_fixedform.f similarity index 100% rename from Tests/Fortran/test_use_in_comment_fixedform.f rename to Tests/FortranModules/test_use_in_comment_fixedform.f diff --git a/Tests/Fortran/test_use_in_comment_freeform.f90 b/Tests/FortranModules/test_use_in_comment_freeform.f90 similarity index 100% rename from Tests/Fortran/test_use_in_comment_freeform.f90 rename to Tests/FortranModules/test_use_in_comment_freeform.f90