fix: remove some relative paths leftovers

Signed-off-by: Roberto Scolaro <[email protected]>
falcosecurity · Jan 26, 2024 · 8ddbedc · 8ddbedc
1 parent f86743f
commit 8ddbedc
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 16 deletions.
diff --git a/test/libscap/test_suites/engines/gvisor/gvisor_platform.cpp b/test/libscap/test_suites/engines/gvisor/gvisor_platform.cpp
@@ -17,8 +17,8 @@ limitations under the License.
 */
 
 #include <gtest/gtest.h>
-#include "scap.h"
-#include "engine/gvisor/gvisor.h"
+#include <libscap/scap.h>
+#include <libscap/engine/gvisor/gvisor.h>
 
 TEST(gvisor_platform, generate_sandbox_id)
 {

diff --git a/userspace/libpman/CMakeLists.txt b/userspace/libpman/CMakeLists.txt
@@ -35,9 +35,6 @@ PRIVATE
     ${LIBBPF_INCLUDE}
     ${MODERN_BPF_SKEL_DIR}
     ${LIBELF_INCLUDE}
-    ${LIBSCAP_DIR}/driver ## ppm_enum and tables
-    ${LIBSCAP_DIR}/userspace/libscap ## scap-stats struct
-    ${LIBSCAP_DIR}/driver/modern_bpf ## bpf-shared structs
 )
 
 target_link_libraries(pman

diff --git a/userspace/libscap/engine/test_input/test_input_public.h b/userspace/libscap/engine/test_input/test_input_public.h
@@ -14,7 +14,7 @@ limitations under the License.
 
 #pragma once
 
-#include "scap_test.h"
+#include <libscap/engine/test_input/scap_test.h>
 #include <libscap/scap_procs.h>
 
 #define TEST_INPUT_ENGINE "test_input"

diff --git a/userspace/libsinsp/cri_settings.cpp b/userspace/libsinsp/cri_settings.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 
 */
 
-#include "cri.hpp"
+#include <libsinsp/cri.hpp>
 
 namespace libsinsp
 {

diff --git a/userspace/libsinsp/sinsp_cycledumper.cpp b/userspace/libsinsp/sinsp_cycledumper.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 
 */
 
-#include "sinsp_cycledumper.h"
+#include <libsinsp/sinsp_cycledumper.h>
 #include <iostream>
 
 

diff --git a/userspace/libsinsp/sinsp_cycledumper.h b/userspace/libsinsp/sinsp_cycledumper.h
@@ -18,8 +18,8 @@ limitations under the License.
 
 #pragma once
 
-#include "sinsp.h"
-#include "dumper.h"
+#include <libsinsp/sinsp.h>
+#include <libsinsp/dumper.h>
 
 #include <memory>
 

diff --git a/userspace/libsinsp/sinsp_syslog.cpp b/userspace/libsinsp/sinsp_syslog.cpp
@@ -16,8 +16,8 @@ limitations under the License.
 
 */
 
-#include "sinsp_syslog.h"
-#include "utils.h"
+#include <libsinsp/sinsp_syslog.h>
+#include <libsinsp/utils.h>
 
 #define PRI_BUF_SIZE 16
 

diff --git a/userspace/libsinsp/sinsp_syslog.h b/userspace/libsinsp/sinsp_syslog.h
@@ -18,7 +18,7 @@ limitations under the License.
 
 #pragma once
 
-#include "sinsp_exception.h"
+#include <libsinsp/sinsp_exception.h>
 
 #include <stdint.h>
 #include <string>

diff --git a/userspace/libsinsp/test/container_engine/container_parser_cri_containerd.ut.cpp b/userspace/libsinsp/test/container_engine/container_parser_cri_containerd.ut.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 #if !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__) // MINIMAL_BUILD and emscripten don't support containers at all
 #include <gtest/gtest.h>
 #include <cri.h>
-#include <cri.hpp>
+#include <libsinsp/cri.hpp>
 #include <test/helpers/threads_helpers.h>
 #include "../sinsp_with_test_input.h"
 

diff --git a/userspace/libsinsp/test/container_engine/container_parser_cri_crio.ut.cpp b/userspace/libsinsp/test/container_engine/container_parser_cri_crio.ut.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 #if !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__) // MINIMAL_BUILD and emscripten don't support containers at all
 #include <gtest/gtest.h>
 #include <cri.h>
-#include <cri.hpp>
+#include <libsinsp/cri.hpp>
 #include <test/helpers/threads_helpers.h>
 #include "../sinsp_with_test_input.h"
 

diff --git a/userspace/libsinsp/test/container_engine/cri_settings.ut.cpp b/userspace/libsinsp/test/container_engine/cri_settings.ut.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 #if !defined(MINIMAL_BUILD) and !defined(__EMSCRIPTEN__) // MINIMAL_BUILD and emscripten don't support containers at all
 #include <gtest/gtest.h>
 #include <cri.h>
-#include <cri.hpp>
+#include <libsinsp/cri.hpp>
 #include "../sinsp_with_test_input.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ limitations under the License. @@
     */
-    #include "cri.hpp"
+    #include <libsinsp/cri.hpp>
     namespace libsinsp
     {
@@ Expand Down @@