Merge upstream-1.4.5 [experimental]

Known issues
  - extension tests failed
  - virtual table tests failed (passed only when it runs as standalone)

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/osquery/main/tests.cpp b/osquery/main/tests.cpp
index 0f92e74..e2ac45c 100644 (file)
--- a/osquery/main/tests.cpp
+++ b/osquery/main/tests.cpp
@@ -26,6 +26,7 @@ DECLARE_string(extensions_socket);
 DECLARE_string(modules_autoload);
 DECLARE_string(extensions_autoload);
 DECLARE_bool(disable_logging);
+DECLARE_bool(verbose);
 
 void initTesting() {
   // Seed the random number generator, some tests generate temporary files
@@ -44,6 +45,7 @@ void initTesting() {
   FLAGS_extensions_autoload = kTestWorkingDirectory + "unittests-ext.load";
   FLAGS_modules_autoload = kTestWorkingDirectory + "unittests-mod.load";
   FLAGS_disable_logging = true;
+  FLAGS_verbose = true;
 
   // Create a default DBHandle instance before unittests.
   (void)DBHandle::getInstance();

diff --git a/osquery/manager/CMakeLists.txt b/osquery/manager/CMakeLists.txt
index d961b47..4570e91 100644 (file)
--- a/osquery/manager/CMakeLists.txt
+++ b/osquery/manager/CMakeLists.txt
@@ -15,4 +15,5 @@
 ADD_OSQUERY_LIBRARY(TRUE osquery_manager manager.cpp
                                                                                 manager_impl.cpp)
 
-ADD_OSQUERY_TEST(TRUE osquery_manager_tests manager_tests.cpp)
+FILE(GLOB OSQUERY_MANAGER_TESTS "tests/*.cpp")
+ADD_OSQUERY_TEST(TRUE ${OSQUERY_MANAGER_TESTS})

diff --git a/osquery/manager/manager_impl.cpp b/osquery/manager/manager_impl.cpp
index bb9db71..01a9c24 100644 (file)
--- a/osquery/manager/manager_impl.cpp
+++ b/osquery/manager/manager_impl.cpp
@@ -33,29 +33,23 @@
 
 #include <boost/filesystem/operations.hpp>
 
+#include <functional>
 #include <sstream>
 
 namespace osquery {
 
 ManagerImpl::ManagerImpl()
 {
-       auto logDir = Flag::get().getValue("osquery_log_dir");
+       auto logDir = Flag::getValue("osquery_log_dir");
        if (!logDir.empty() && !(pathExists(logDir).ok()))
                boost::filesystem::create_directories(logDir);
 
-       // TODO(Sangwan): Get debug mode at build time
-       Flag::updateValue("verbose_debug", "true");
-
-       const char* cargv[] = {"tizen-osquery"};
-       osquery::initOsquery(1, const_cast<char**>(cargv));
-
        LOG(INFO) << "Initalize osquery manager. ";
 }
 
 ManagerImpl::~ManagerImpl() noexcept
 {
        LOG(INFO) << "Shutdown osquery manager.";
-       osquery::shutdownOsquery();
 }
 
 ManagerImpl& ManagerImpl::instance()

diff --git a/osquery/manager/manager_tests.cpp b/osquery/manager/tests/manager_tests.cpp
similarity index 95%
rename from osquery/manager/manager_tests.cpp
rename to osquery/manager/tests/manager_tests.cpp
index de72711..048cfcc 100644 (file)
--- a/osquery/manager/manager_tests.cpp
+++ b/osquery/manager/tests/manager_tests.cpp
@@ -76,8 +76,3 @@ TEST_F(ManagerTests, test_manager_columns) {
        for (const auto& c : columns)
                VLOG(1) << "\t" << c;
 }
-
-int main(int argc, char* argv[]) {
-       testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
-}

diff --git a/osquery/notification/CMakeLists.txt b/osquery/notification/CMakeLists.txt
index 956f83c..4083340 100644 (file)
--- a/osquery/notification/CMakeLists.txt
+++ b/osquery/notification/CMakeLists.txt
@@ -14,4 +14,5 @@
 
 ADD_OSQUERY_LIBRARY(TRUE osquery_notification notification.cpp)
 
-ADD_OSQUERY_TEST(TRUE osquery_notification_tests notification_tests.cpp)
+FILE(GLOB OSQUERY_NOTIFICATION_TESTS "tests/*.cpp")
+ADD_OSQUERY_TEST(TRUE ${OSQUERY_NOTIFICATION_TESTS})

diff --git a/osquery/notification/notification_tests.cpp b/osquery/notification/tests/notification_tests.cpp
similarity index 95%
rename from osquery/notification/notification_tests.cpp
rename to osquery/notification/tests/notification_tests.cpp
index 0c21df2..f26bfa3 100644 (file)
--- a/osquery/notification/notification_tests.cpp
+++ b/osquery/notification/tests/notification_tests.cpp
@@ -70,8 +70,3 @@ TEST_F(NotificationTests, test_emit_positive) {
        EXPECT_TRUE(s.ok());
        EXPECT_EQ(called, 1);
 }
-
-int main(int argc, char* argv[]) {
-       testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
-}

diff --git a/osquery/property/CMakeLists.txt b/osquery/property/CMakeLists.txt
index 4e8fe1e..d4082a6 100644 (file)
--- a/osquery/property/CMakeLists.txt
+++ b/osquery/property/CMakeLists.txt
@@ -14,4 +14,5 @@
 
 ADD_OSQUERY_LIBRARY(TRUE osquery_property property.cpp)
 
-ADD_OSQUERY_TEST(TRUE osquery_property_tests property_tests.cpp)
+FILE(GLOB OSQUERY_PROPERTY_TESTS "tests/*.cpp")
+ADD_OSQUERY_TEST(TRUE ${OSQUERY_PROPERTY_TESTS})

diff --git a/osquery/property/property_tests.cpp b/osquery/property/tests/property_tests.cpp
similarity index 97%
rename from osquery/property/property_tests.cpp
rename to osquery/property/tests/property_tests.cpp
index c1bb9a5..55657db 100644 (file)
--- a/osquery/property/property_tests.cpp
+++ b/osquery/property/tests/property_tests.cpp
@@ -132,8 +132,3 @@ TEST_F(PropertyTests, properties) {
 
 //     EXPECT_NE(result.hour, -1);
 }
-
-int main(int argc, char* argv[]) {
-       testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
-}

diff --git a/tsqb/CMakeLists.txt b/tsqb/CMakeLists.txt
index 4c77699..d4874e6 100644 (file)
--- a/tsqb/CMakeLists.txt
+++ b/tsqb/CMakeLists.txt
@@ -12,4 +12,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License
 
-ADD_OSQUERY_TEST(FALSE tsqb_tests tsqb-tests.cpp)
+FILE(GLOB TSQB_TESTS "tests/*.cpp")
+ADD_OSQUERY_TEST(TRUE ${TSQB_TESTS})

diff --git a/tsqb/tsqb-tests.cpp b/tsqb/tests/tsqb-tests.cpp
similarity index 98%
rename from tsqb/tsqb-tests.cpp
rename to tsqb/tests/tsqb-tests.cpp
index aac1e7d..7770140 100644 (file)
--- a/tsqb/tsqb-tests.cpp
+++ b/tsqb/tests/tsqb-tests.cpp
@@ -195,8 +195,3 @@ TEST_F(TsqbTests, JOIN)
                                         "INNER JOIN admin ON managed_policy.aid = admin.id "
                                         "WHERE managed_policy.pid = ?");
 }
-
-int main(int argc, char* argv[]) {
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}