Pass unittest binary name to getInputFileDirectory() for NativeSymbolReuseTest

[dschuff]

Summary

r341502 added an extern declaration of TestMainArgv0 in
testing/Support/SupportHelpers.cpp; It is defined in libgtest_main,
which broke the BUILD_SHARED_LIBS build of LLVM.

So pass the unittest binary name as a parameter instead of using it directly from the helper function.

[zturner]

I think we can also get around this by just passing the arg as a parameter.
Alternatively, this library is trivially small, we could force it to be
statically linked

[dschuff]

• Pass the binary name as a parameter instead

[dschuff]

Passing it as a parameter does sound better.

[zturner]

I think someone else already fixed this, can you check?

[dschuff]

Yeah, rL341580 looks almost identical to this.

include/llvm/Testing/Support/SupportHelpers.h

if (Item.Success()) {
     *Out << "succeeded with value " << ::testing::PrintToString(*Item.Exp);
   } else {
     PrintTo(static_cast<const ErrorHolder &>(Item), Out);
   }
 }
 } // namespace detail
 
 namespace unittest {
-SmallString<128> getInputFileDirectory();
+SmallString<128> getInputFileDirectory(const char *TestBinary);
 }
 } // namespace llvm
 
 #endif

lib/Testing/Support/SupportHelpers.cpp

 
 #include "llvm/Testing/Support/SupportHelpers.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 
 #include "gtest/gtest.h"
 
 using namespace llvm;
 using namespace llvm::unittest;
 
-extern const char *TestMainArgv0;
-
-SmallString<128> llvm::unittest::getInputFileDirectory() {
-  llvm::SmallString<128> Result = llvm::sys::path::parent_path(TestMainArgv0);
+SmallString<128> llvm::unittest::getInputFileDirectory(const char *TestBinary) {
+  llvm::SmallString<128> Result = llvm::sys::path::parent_path(TestBinary);
   llvm::sys::fs::make_absolute(Result);
   llvm::sys::path::append(Result, "llvm.srcdir.txt");
 
   EXPECT_TRUE(llvm::sys::fs::is_regular_file(Result))
       << "Unit test source directory file does not exist.";
 
   auto File = MemoryBuffer::getFile(Result);
 

unittests/DebugInfo/PDB/NativeSymbolReuseTest.cpp

 #include "llvm/Testing/Support/Error.h"
 #include "llvm/Testing/Support/SupportHelpers.h"
 
 #include "gtest/gtest.h"
 
 using namespace llvm;
 using namespace llvm::pdb;
 
+extern const char *TestMainArgv0;
+
 TEST(NativeSymbolReuseTest, GlobalSymbolReuse) {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory();
+  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
   llvm::sys::path::append(InputsDir, "empty.pdb");
 
   std::unique_ptr<IPDBSession> S;
   Error E = pdb::loadDataForPDB(PDB_ReaderType::Native, InputsDir, S);
 
   ASSERT_THAT_ERROR(std::move(E), Succeeded());
 
   SymIndexId GlobalId;
SymIndexId GlobalId;
     auto GS3 = S->getGlobalScope();
 
     SymIndexId Id3 = GS3->getSymIndexId();
     EXPECT_EQ(GlobalId, Id3);
   }
 }
 
 TEST(NativeSymbolReuseTest, CompilandSymbolReuse) {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory();
+  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
   llvm::sys::path::append(InputsDir, "empty.pdb");
 
   std::unique_ptr<IPDBSession> S;
   Error E = pdb::loadDataForPDB(PDB_ReaderType::Native, InputsDir, S);
 
   ASSERT_THAT_ERROR(std::move(E), Succeeded());
 
   auto GS = S->getGlobalScope();
std::vector<SymIndexId> CompilandIds;
     while (auto Compiland = Compilands->getNext())
       Ids3.push_back(Compiland->getSymIndexId());
 
     EXPECT_EQ(CompilandIds, Ids3);
   }
 }
 
 TEST(NativeSymbolReuseTest, CompilandSymbolReuseBackwards) {
-  SmallString<128> InputsDir = unittest::getInputFileDirectory();
+  SmallString<128> InputsDir = unittest::getInputFileDirectory(TestMainArgv0);
   llvm::sys::path::append(InputsDir, "empty.pdb");
 
   std::unique_ptr<IPDBSession> S;
   Error E = pdb::loadDataForPDB(PDB_ReaderType::Native, InputsDir, S);
 
   ASSERT_THAT_ERROR(std::move(E), Succeeded());
 
   auto GS = S->getGlobalScope();