Remove some custom test main()'s in folly/experimental/symbolizer/
authorYedidya Feldblum <yfeldblum@fb.com>
Tue, 28 Nov 2017 06:18:54 +0000 (22:18 -0800)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Tue, 28 Nov 2017 06:22:27 +0000 (22:22 -0800)
Summary:
[Folly] Remove some custom test `main()`'s in `folly/experimental/symbolizer/`.

In one of the two cases, we need to do some extra work to give `ElfFile` knowledge of the program path.

Reviewed By: ot, Orvid, philippv, luciang

Differential Revision: D6420517

fbshipit-source-id: 11c694a8342abb6fff05c368f3cda2e6287ccb4b

folly/experimental/symbolizer/test/ElfTests.cpp
folly/experimental/symbolizer/test/StackTraceTest.cpp

index 51d8531..b81f52e 100644 (file)
@@ -25,19 +25,10 @@ uint64_t kIntegerValue = 1234567890UL;
 const char* kStringValue = "coconuts";
 
 class ElfTest : public ::testing::Test {
- public:
-  // Path to the test binary itself; set by main()
-  static std::string binaryPath;
-
-  ElfTest() : elfFile_(binaryPath.c_str()) {}
-  ~ElfTest() override {}
-
  protected:
-  ElfFile elfFile_;
+  ElfFile elfFile_{"/proc/self/exe"};
 };
 
-std::string ElfTest::binaryPath;
-
 TEST_F(ElfTest, IntegerValue) {
   auto sym = elfFile_.getSymbolByName("kIntegerValue");
   EXPECT_NE(nullptr, sym.first) << "Failed to look up symbol kIntegerValue";
@@ -58,10 +49,3 @@ TEST_F(ElfTest, iterateProgramHeaders) {
   EXPECT_NE(nullptr, phdr);
   EXPECT_GE(phdr->p_filesz, 0);
 }
-
-int main(int argc, char** argv) {
-  testing::InitGoogleTest(&argc, argv);
-  gflags::ParseCommandLineFlags(&argc, &argv, true);
-  ElfTest::binaryPath = argv[0];
-  return RUN_ALL_TESTS();
-}
index 99e8c32..bc609d7 100644 (file)
@@ -88,10 +88,3 @@ TEST(StackTraceTest, Signal) {
   raise(SIGUSR1);
   EXPECT_TRUE(handled);
 }
-
-int main(int argc, char* argv[]) {
-  testing::InitGoogleTest(&argc, argv);
-  gflags::ParseCommandLineFlags(&argc, &argv, true);
-  google::InitGoogleLogging(argv[0]);
-  return RUN_ALL_TESTS();
-}