From e3645eadb8f28a522243d628dcc0d37e5af9aecf Mon Sep 17 00:00:00 2001
From: Siva Chandra Reddy <sivachandra@google.com>
Date: Tue, 18 Apr 2023 08:09:18 +0000
Subject: [PATCH] [libc][NFC] Move ExecuteFunction test util to test/UnitTest.

Reviewed By: lntue

Differential Revision: https://reviews.llvm.org/D148611
---
 libc/test/UnitTest/CMakeLists.txt                          | 14 ++++++++++++--
 libc/{utils/testutils => test/UnitTest}/ExecuteFunction.h  |  5 +++--
 .../testutils => test/UnitTest}/ExecuteFunctionUnix.cpp    |  0
 libc/test/UnitTest/LibcTest.cpp                            |  2 +-
 libc/test/UnitTest/LibcTest.h                              |  2 +-
 libc/utils/testutils/CMakeLists.txt                        |  6 ------
 .../llvm-project-overlay/libc/test/UnitTest/BUILD.bazel    |  2 ++
 .../llvm-project-overlay/libc/utils/testutils/BUILD.bazel  |  2 --
 8 files changed, 19 insertions(+), 14 deletions(-)
 rename libc/{utils/testutils => test/UnitTest}/ExecuteFunction.h (90%)
 rename libc/{utils/testutils => test/UnitTest}/ExecuteFunctionUnix.cpp (100%)

diff --git a/libc/test/UnitTest/CMakeLists.txt b/libc/test/UnitTest/CMakeLists.txt
index 765abb1..aa4cca0 100644
--- a/libc/test/UnitTest/CMakeLists.txt
+++ b/libc/test/UnitTest/CMakeLists.txt
@@ -1,11 +1,21 @@
-add_library(
-  LibcUnitTest
+set(libc_unit_test_srcs
+  ExecuteFunction.h
   Test.h
   LibcTest.cpp
   LibcTest.h
   TestLogger.cpp
   TestLogger.h
 )
+
+if(${LIBC_TARGET_OS} STREQUAL "linux")
+  list(APPEND libc_unit_test_srcs ExecuteFunctionUnix.cpp)
+endif()
+
+add_library(
+  LibcUnitTest
+  ${libc_unit_test_srcs}
+)
+
 target_include_directories(LibcUnitTest PUBLIC ${LIBC_SOURCE_DIR})
 add_dependencies(
   LibcUnitTest
diff --git a/libc/utils/testutils/ExecuteFunction.h b/libc/test/UnitTest/ExecuteFunction.h
similarity index 90%
rename from libc/utils/testutils/ExecuteFunction.h
rename to libc/test/UnitTest/ExecuteFunction.h
index d1105ac..335720f 100644
--- a/libc/utils/testutils/ExecuteFunction.h
+++ b/libc/test/UnitTest/ExecuteFunction.h
@@ -40,8 +40,9 @@ struct ProcessStatus {
   int get_fatal_signal();
 };
 
-ProcessStatus invoke_in_subprocess(FunctionCaller *func,
-                                   unsigned timeout_ms = ProcessStatus::TIMEOUT);
+ProcessStatus
+invoke_in_subprocess(FunctionCaller *func,
+                     unsigned timeout_ms = ProcessStatus::TIMEOUT);
 
 const char *signal_as_string(int signum);
 
diff --git a/libc/utils/testutils/ExecuteFunctionUnix.cpp b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
similarity index 100%
rename from libc/utils/testutils/ExecuteFunctionUnix.cpp
rename to libc/test/UnitTest/ExecuteFunctionUnix.cpp
diff --git a/libc/test/UnitTest/LibcTest.cpp b/libc/test/UnitTest/LibcTest.cpp
index 0e50253..b3a7fc1 100644
--- a/libc/test/UnitTest/LibcTest.cpp
+++ b/libc/test/UnitTest/LibcTest.cpp
@@ -11,8 +11,8 @@
 #include "src/__support/CPP/string.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/UInt128.h"
+#include "test/UnitTest/ExecuteFunction.h"
 #include "test/UnitTest/TestLogger.h"
-#include "utils/testutils/ExecuteFunction.h"
 #include <cassert>
 
 namespace __llvm_libc {
diff --git a/libc/test/UnitTest/LibcTest.h b/libc/test/UnitTest/LibcTest.h
index e3da14d..a1343e2 100644
--- a/libc/test/UnitTest/LibcTest.h
+++ b/libc/test/UnitTest/LibcTest.h
@@ -17,8 +17,8 @@
 #include "src/__support/CPP/string.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/CPP/type_traits.h"
+#include "test/UnitTest/ExecuteFunction.h"
 #include "test/UnitTest/TestLogger.h"
-#include "utils/testutils/ExecuteFunction.h"
 
 namespace __llvm_libc {
 namespace testing {
diff --git a/libc/utils/testutils/CMakeLists.txt b/libc/utils/testutils/CMakeLists.txt
index 6e426f4..8f5a10c 100644
--- a/libc/utils/testutils/CMakeLists.txt
+++ b/libc/utils/testutils/CMakeLists.txt
@@ -1,10 +1,4 @@
-if(CMAKE_HOST_UNIX)
-  set(EFFile ExecuteFunctionUnix.cpp)
-endif()
-
 add_library(
   libc_test_utils
-  ${EFFile}
-  ExecuteFunction.h
   RoundingModeUtils.cpp
 )
diff --git a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
index aa55afd..60010e3 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -23,10 +23,12 @@ cc_library(
 cc_library(
     name = "LibcUnitTest",
     srcs = [
+        "ExecuteFunctionUnix.cpp",
         "LibcTest.cpp",
         "LibcTestMain.cpp",
     ],
     hdrs = [
+        "ExecuteFunction.h",
         "LibcTest.h",
         "PlatformDefs.h",
         "Test.h",
diff --git a/utils/bazel/llvm-project-overlay/libc/utils/testutils/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/utils/testutils/BUILD.bazel
index 9f58814..43191e1 100644
--- a/utils/bazel/llvm-project-overlay/libc/utils/testutils/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/utils/testutils/BUILD.bazel
@@ -9,11 +9,9 @@ licenses(["notice"])
 cc_library(
     name = "libc_test_utils",
     srcs = [
-        "ExecuteFunctionUnix.cpp",
         "RoundingModeUtils.cpp",
     ],
     hdrs = [
-        "ExecuteFunction.h",
         "RoundingModeUtils.h",
     ],
     deps = [
-- 
2.7.4