Fix build error on upstream-1.4.2

Known issues
  - extension tests failed
  - Tizen build failed

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

diff --git a/osquery/core/test_util.cpp b/osquery/core/test_util.cpp
index d148631bae4fbf8f1d18ce814066d6b9628401be..f4aa2b6231ce34ce838f6bf902d886af20483d0f 100644 (file)
--- a/osquery/core/test_util.cpp
+++ b/osquery/core/test_util.cpp
@@ -25,11 +25,7 @@ namespace osquery {
 
 const std::string kTestQuery = "SELECT * FROM test_table";
 
-#ifndef OSQUERY_BUILD_SDK
-const std::string kTestDataPath = "../../../../tools/tests/";
-#else
-const std::string kTestDataPath = "../../../../../tools/tests/";
-#endif
+const std::string kTestDataPath = "../../../tools/tests/";
 
 QueryData getTestDBExpectedResults() {
   QueryData d;

diff --git a/osquery/extensions/extensions.cpp b/osquery/extensions/extensions.cpp
index a75ede42a952564fcf8722ae16f43f20f85c51b7..a8b65eb516d6f1bf64f16b1f18cdc88a2624efe8 100644 (file)
--- a/osquery/extensions/extensions.cpp
+++ b/osquery/extensions/extensions.cpp
@@ -103,7 +103,10 @@ Status startExtension(const std::string& name,
   }
 
   status = startExtension(
-      FLAGS_extensions_socket, name, version, min_sdk_version, kSDKVersion);
+// TODO(Sangwan): Sync with upstream code
+      FLAGS_extensions_socket, name, version, min_sdk_version, "1.4.1");
+// HotFix: Below upstream code makes undefined error.
+//   FLAGS_extensions_socket, name, version, min_sdk_version, kSDKVersion);
   if (!status.ok()) {
     // If the extension failed to start then the EM is most likely unavailable.
     return status;