[libc-commits] [libc] 8a4ee35 - [libc] Make more of the libc unit testing llvm independent

[Michael Jones via libc-commits]

Author: Michael Jones
Date: 2020-11-21T00:27:08Z
New Revision: 8a4ee3550b7c7bb5c7e453377e3d5bc4d90182a2

URL: https://github.com/llvm/llvm-project/commit/8a4ee3550b7c7bb5c7e453377e3d5bc4d90182a2
DIFF: https://github.com/llvm/llvm-project/commit/8a4ee3550b7c7bb5c7e453377e3d5bc4d90182a2.diff

LOG: [libc] Make more of the libc unit testing llvm independent

(WIP, hopefully I'll add more to this patch before submitting)

Reviewed By: sivachandra

Differential Revision: https://reviews.llvm.org/D91665

Added: 
    

Modified: 
    libc/utils/UnitTest/CMakeLists.txt
    libc/utils/testutils/CMakeLists.txt
    libc/utils/testutils/ExecuteFunctionUnix.cpp
    libc/utils/testutils/FDReaderUnix.cpp
    libc/utils/testutils/StreamWrapper.cpp

Removed: 
    


################################################################################
diff  --git a/libc/utils/UnitTest/CMakeLists.txt b/libc/utils/UnitTest/CMakeLists.txt
index 9c7b48aea4f9..1c9753e62a59 100644
--- a/libc/utils/UnitTest/CMakeLists.txt
+++ b/libc/utils/UnitTest/CMakeLists.txt
@@ -2,7 +2,6 @@ add_llvm_library(
   LibcUnitTest
   Test.cpp
   Test.h
-  LINK_COMPONENTS Support
 )
 target_include_directories(LibcUnitTest PUBLIC ${LIBC_SOURCE_DIR})
 add_dependencies(LibcUnitTest libc.utils.CPP.standalone_cpp)

diff  --git a/libc/utils/testutils/CMakeLists.txt b/libc/utils/testutils/CMakeLists.txt
index 80c23f4b0769..70237ddc1f8d 100644
--- a/libc/utils/testutils/CMakeLists.txt
+++ b/libc/utils/testutils/CMakeLists.txt
@@ -11,6 +11,4 @@ add_llvm_library(
   ExecuteFunction.h
   ${FDReaderFile}
   FDReader.h
-  LINK_COMPONENTS
-    Support
 )

diff  --git a/libc/utils/testutils/ExecuteFunctionUnix.cpp b/libc/utils/testutils/ExecuteFunctionUnix.cpp
index 60e367a40cb6..4050a0ca8a6e 100644
--- a/libc/utils/testutils/ExecuteFunctionUnix.cpp
+++ b/libc/utils/testutils/ExecuteFunctionUnix.cpp
@@ -7,9 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExecuteFunction.h"
-#include "llvm/Support/raw_ostream.h"
 #include <cassert>
 #include <cstdlib>
+#include <cstring>
+#include <iostream>
 #include <memory>
 #include <poll.h>
 #include <signal.h>
@@ -41,8 +42,8 @@ ProcessStatus invokeInSubprocess(FunctionCaller *Func, unsigned timeoutMS) {
     return ProcessStatus::Error("pipe(2) failed");
 
   // Don't copy the buffers into the child process and print twice.
-  llvm::outs().flush();
-  llvm::errs().flush();
+  std::cout.flush();
+  std::cerr.flush();
   pid_t Pid = ::fork();
   if (Pid == -1)
     return ProcessStatus::Error("fork(2) failed");

diff  --git a/libc/utils/testutils/FDReaderUnix.cpp b/libc/utils/testutils/FDReaderUnix.cpp
index c54a1a423d86..db1f63f0dcc3 100644
--- a/libc/utils/testutils/FDReaderUnix.cpp
+++ b/libc/utils/testutils/FDReaderUnix.cpp
@@ -7,17 +7,19 @@
 //===----------------------------------------------------------------------===//
 
 #include "FDReader.h"
-#include "llvm/Support/MemoryBuffer.h"
 #include <cassert>
 #include <cstring>
+#include <iostream>
 #include <unistd.h>
 
 namespace __llvm_libc {
 namespace testutils {
 
 FDReader::FDReader() {
-  if (::pipe(pipefd))
-    llvm::report_fatal_error("pipe(2) failed");
+  if (::pipe(pipefd)) {
+    std::cerr << "pipe(2) failed";
+    abort();
+  }
 }
 
 FDReader::~FDReader() {
@@ -26,15 +28,25 @@ FDReader::~FDReader() {
 }
 
 bool FDReader::matchWritten(const char *str) {
-  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> bufOrErr =
-      llvm::MemoryBuffer::getOpenFile(pipefd[0], "<pipe>",
-                                      /* FileSize (irrelevant) */ 0);
-  if (!bufOrErr) {
-    assert(0 && "Error reading from pipe");
-    return false;
+
+  ::close(pipefd[1]);
+
+  constexpr ssize_t ChunkSize = 4096 * 4;
+
+  char Buffer[ChunkSize];
+  std::string PipeStr;
+  std::string InputStr(str);
+
+  for (int BytesRead; (BytesRead = ::read(pipefd[0], Buffer, ChunkSize));) {
+    if (BytesRead > 0) {
+      PipeStr.insert(PipeStr.size(), Buffer, BytesRead);
+    } else {
+      assert(0 && "Error reading from pipe");
+      return false;
+    }
   }
-  const llvm::MemoryBuffer &buf = **bufOrErr;
-  return !std::strncmp(buf.getBufferStart(), str, buf.getBufferSize());
+
+  return PipeStr == InputStr;
 }
 
 } // namespace testutils

diff  --git a/libc/utils/testutils/StreamWrapper.cpp b/libc/utils/testutils/StreamWrapper.cpp
index f6318a993401..9071ebca245c 100644
--- a/libc/utils/testutils/StreamWrapper.cpp
+++ b/libc/utils/testutils/StreamWrapper.cpp
@@ -7,19 +7,19 @@
 //===----------------------------------------------------------------------===//
 
 #include "StreamWrapper.h"
-#include "llvm/Support/raw_ostream.h"
 #include <cassert>
+#include <iostream>
 #include <memory>
 #include <string>
 
 namespace __llvm_libc {
 namespace testutils {
 
-StreamWrapper outs() { return {std::addressof(llvm::outs())}; }
+StreamWrapper outs() { return {std::addressof(std::cout)}; }
 
 template <typename T> StreamWrapper &StreamWrapper::operator<<(T t) {
   assert(OS);
-  llvm::raw_ostream &Stream = *reinterpret_cast<llvm::raw_ostream *>(OS);
+  std::ostream &Stream = *reinterpret_cast<std::ostream *>(OS);
   Stream << t;
   return *this;
 }