[flang] Move External IO tests to use GTest

Port external-io test to use GTest. Remove Runtime tests directory.
Rename RuntimeGTest directory to Runtime.

This is the last in a series of patches which ported tests from the old
flang/unittests/Runtime test directory to use GTest in a temporary
unittest directory under flang/unittests/RuntimeGTest. Now that all the
tests in the old directory have been ported to use GTest, the old
directory has been removed and the GTest directory has been renamed to
flang/unittests/Runtime.

Differential Revision: https://reviews.llvm.org/D105315
Reviewed by: Meinersbur, awarzynski

Author: ashermancinelli

flang/unittests/CMakeLists.txt

@@ -40,7 +40,6 @@ add_subdirectory(Optimizer)
 add_subdirectory(Decimal)
 add_subdirectory(Evaluate)
 add_subdirectory(Runtime)
-add_subdirectory(RuntimeGTest)
 
 if (FLANG_BUILD_NEW_DRIVER)
   add_subdirectory(Frontend)

flang/unittests/RuntimeGTest/BufferTest.cpp renamed to flang/unittests/Runtime/BufferTest.cpp

@@ -1,24 +1,23 @@
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-# RuntimeTesting needs exceptions enabled
-set(LLVM_REQUIRES_EH ON)
-set(LLVM_REQUIRES_RTTI ON)
-add_library(RuntimeTesting
-  testing.cpp
-)
-llvm_update_compile_flags(RuntimeTesting)
-
-if (LLVM_LINK_LLVM_DYLIB)
-  set(llvm_libs LLVM)
-else()
-  llvm_map_components_to_libnames(llvm_libs Support)
-endif()
-target_link_libraries(RuntimeTesting
-  FortranRuntime
-  ${llvm_libs}
+add_flang_unittest(FlangRuntimeTests
+  BufferTest.cpp
+  CharacterTest.cpp
+  CrashHandlerFixture.cpp
+  ExternalIOTest.cpp
+  Format.cpp
+  ListInputTest.cpp
+  Matmul.cpp
+  MiscIntrinsic.cpp
+  Namelist.cpp
+  Numeric.cpp
+  NumericalFormatTest.cpp
+  Random.cpp
+  Reduction.cpp
+  RuntimeCrashTest.cpp
+  Time.cpp
+  Transformational.cpp
 )
 
-add_flang_nongtest_unittest(external-io
-  RuntimeTesting
+target_link_libraries(FlangRuntimeTests
+  PRIVATE
   FortranRuntime
 )

flang/unittests/Runtime/CMakeLists.txt

@@ -10,8 +10,8 @@
 // in Fortran.
 
 #include "../../runtime/character.h"
-#include "../../runtime/descriptor.h"
 #include "gtest/gtest.h"
+#include "../../runtime/descriptor.h"
 #include <cstring>
 #include <functional>
 #include <tuple>
@@ -264,17 +264,12 @@ template <typename CHAR> struct ExtremumTests : public ::testing::Test {};
 TYPED_TEST_SUITE(ExtremumTests, CharacterTypes, );
 
 TYPED_TEST(ExtremumTests, MinTests) {
-  static std::vector<ExtremumTestCase> tests{
-      {{}, {"a"}, {"z"}, {"a"}},
+  static std::vector<ExtremumTestCase> tests{{{}, {"a"}, {"z"}, {"a"}},
       {{1}, {"zaaa"}, {"aa"}, {"aa  "}},
       {{1, 1}, {"aaz"}, {"aaaaa"}, {"aaaaa"}},
-      {
-        { 2, 3 },
-        { "a",  "b",  "c",  "d",  "E",  "f" },
-        { "xa", "ya", "az", "dd", "Sz", "cc"},
-        { "a ", "b ", "az", "d ", "E ", "cc"}
-      }
-  };
+      {{2, 3}, {"a", "b", "c", "d", "E", "f"},
+          {"xa", "ya", "az", "dd", "Sz", "cc"},
+          {"a ", "b ", "az", "d ", "E ", "cc"}}};
   RunExtremumTests<TypeParam>("MIN", RTNAME(CharacterMin), tests);
 }