From 79ffcc17933f2b132de4bf42b9ec2f9e857ca433 Mon Sep 17 00:00:00 2001
From: Tyler Neely <t@jujit.su>
Date: Thu, 18 Aug 2022 12:45:48 +0000
Subject: [PATCH] Separate thrift concerns from other unit tests

---
 tests/unit/CMakeLists.txt | 7 +++----
 tests/unit/main.cpp       | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index db93aef02..f4d71fa73 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -1,11 +1,10 @@
-# include(MgThrift)
+include(MgThrift)
 
 set(test_prefix memgraph__unit__)
 
 find_package(fmt REQUIRED)
 find_package(gflags REQUIRED)
 find_package(Threads REQUIRED)
-find_package(Folly REQUIRED)
 
 add_custom_target(memgraph__unit)
 
@@ -40,7 +39,7 @@ function(_add_unit_test test_cpp custom_main)
   # used to help create two targets of the same name even though CMake
   # requires unique logical target names
   set_target_properties(${target_name} PROPERTIES OUTPUT_NAME ${exec_name})
-  target_link_libraries(${target_name} mg-memory mg-utils gtest gmock Threads::Threads dl mg-interface-echo-cpp2)
+  target_link_libraries(${target_name} mg-memory mg-utils gtest gmock Threads::Threads dl)
 
   # register test
   if(TEST_COVERAGE)
@@ -400,4 +399,4 @@ target_link_libraries(${test_prefix}future mg-io)
 
 # Test Thrift transport echo
 add_unit_test(thrift_transport_echo.cpp)
-target_link_libraries(${test_prefix}thrift_transport_echo mg-io Threads::Threads mg-interface-echo-cpp2 fmt)
+target_link_libraries(${test_prefix}thrift_transport_echo mg-io fmt Threads::Threads FBThrift::thriftcpp2 mg-interface-echo-cpp2)
diff --git a/tests/unit/main.cpp b/tests/unit/main.cpp
index a81ed608c..c21c5b2cf 100644
--- a/tests/unit/main.cpp
+++ b/tests/unit/main.cpp
@@ -9,15 +9,12 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#include <folly/init/Init.h>
 #include <gtest/gtest.h>
 #include <utils/logging.hpp>
 
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
 
-  folly::Init(&argc, &argv);
-
   memgraph::logging::RedirectToStderr();
   spdlog::set_level(spdlog::level::trace);
   return RUN_ALL_TESTS();