Revert r197600 while I sort out why it's failing on Windows.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@197602 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/ArchiveFileDescriptor/ArchiveFileDescriptor.cpp b/unittests/ArchiveFileDescriptor/ArchiveFileDescriptor.cpp
deleted file mode 100644 (file)
index 193e571..0000000
--- a/unittests/ArchiveFileDescriptor/ArchiveFileDescriptor.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===- llvm/unittest/ArchiveFileDescriptor/ArchiveFileDescriptor.cpp ------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/Archive.h"
-#include "llvm/Object/ObjectFile.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace llvm::object;
-
-static void failIfError(error_code EC) {
-  if (!EC)
-    return;
-
-  errs() << "ERROR: " << EC.message() << "\n";
-  exit(1);
-}
-
-TEST(ArchiveFileDescriptor, Test1) {
-  int FD;
-
-  error_code EC = sys::fs::openFileForRead("ArchiveFileDescriptor", FD);
-  failIfError(EC);
-
-  OwningPtr<MemoryBuffer> MemoryBuffer;
-  EC = MemoryBuffer::getOpenFile(FD, "Dummy Filename",
-                                 MemoryBuffer,
-                                 /* FileSize */ -1,
-                                 /* RequiresNullTerminator */ false);
-  failIfError(EC);
-
-  // Attempt to open the binary.
-  OwningPtr<Binary> Binary;
-  EC = createBinary(MemoryBuffer.take(), Binary);
-  failIfError(EC);
-
-  if (Archive *Arc = dyn_cast<Archive>(Binary.get())) {
-    (void)Arc;
-    errs() << "ERROR: Loaded archive, was expecting object file\n";
-  } else if (ObjectFile *Obj = dyn_cast<ObjectFile>(Binary.get())) {
-    (void)Obj;
-  } else {
-    outs() << "ERROR: Unknown file type\n";
-    exit(1);
-  }
-}

diff --git a/unittests/ArchiveFileDescriptor/CMakeLists.txt b/unittests/ArchiveFileDescriptor/CMakeLists.txt
deleted file mode 100644 (file)
index c7e292a..0000000
--- a/unittests/ArchiveFileDescriptor/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Object
-  Support
-  )
-
-add_llvm_unittest(ArchiveFileDescriptor
-  ArchiveFileDescriptor.cpp
-  )

diff --git a/unittests/ArchiveFileDescriptor/Makefile b/unittests/ArchiveFileDescriptor/Makefile
deleted file mode 100644 (file)
index 460b86c..0000000
--- a/unittests/ArchiveFileDescriptor/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-##===- unittests/ArchiveFileDescriptor/Makefile ------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-TESTNAME = ArchiveFileDescriptor
-LINK_COMPONENTS := object
-
-include $(LEVEL)/Makefile.config
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 9857e787eebee522c60c0c181674f9198b20a88c..52702ba23aac616060784a4bc286c0edaddd3bc7 100644 (file)
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -7,7 +7,6 @@ endfunction()
 
 add_subdirectory(ADT)
 add_subdirectory(Analysis)
-add_subdirectory(ArchiveFileDescriptor)
 add_subdirectory(Bitcode)
 add_subdirectory(CodeGen)
 add_subdirectory(DebugInfo)

diff --git a/unittests/Makefile b/unittests/Makefile
index d80cab262127430cf58c6b06ccbce8b2059a2acf..06ba93243e38557f395035825aaf41fce5ea9550 100644 (file)
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -9,8 +9,8 @@
 
 LEVEL = ..
 
-PARALLEL_DIRS = ADT Analysis ArchiveFileDescriptor Bitcode CodeGen DebugInfo \
-               ExecutionEngine IR MC Object Option Support Transforms
+PARALLEL_DIRS = ADT Analysis Bitcode CodeGen DebugInfo ExecutionEngine IR \
+               MC Object Option Support Transforms
 
 include $(LEVEL)/Makefile.common