btparser integration: fix tests

5 files changed, 78 insertions, 78 deletions

diff --git a/tests/btparser/backtrace.at b/tests/btparser/backtrace.at
index 057d2e63..d0b1467c 100644
--- a/tests/btparser/backtrace.at
+++ b/tests/btparser/backtrace.at
@@ -7,8 +7,8 @@ AT_BANNER([Backtraces])
 ## --------------------------------------- ##
 AT_TESTFUN([btp_backtrace_remove_threads_except_one],
 [[
-#include <lib/backtrace.h>
-#include <lib/thread.h>
+#include <backtrace.h>
+#include <thread.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -59,12 +59,12 @@ int main(void)
 ## btp_backtrace_find_crash_thread ##
 ## ------------------------------- ##
 AT_TESTFUN([btp_backtrace_find_crash_thread],
-[
-#include <lib/backtrace.h>
-#include <lib/thread.h>
-#include <lib/frame.h>
-#include <lib/location.h>
-#include <lib/utils.h>
+[[
+#include <backtrace.h>
+#include <thread.h>
+#include <frame.h>
+#include <location.h>
+#include <utils.h>
 #include <assert.h>
 
 int main(void)
@@ -72,7 +72,7 @@ int main(void)
   /* Load the backtrace from Red Hat Bugzilla bug #621492. */
   struct btp_location location;
   btp_location_init(&location);
-  char *full_input = btp_file_to_string("../../backtraces/621492.bt");
+  char *full_input = btp_file_to_string("../../btparser/backtraces/621492.bt");
   assert(full_input);
   char *input = full_input;
   struct btp_backtrace *backtrace = btp_backtrace_parse(&input, &location);
@@ -85,17 +85,17 @@ int main(void)
   btp_backtrace_free(backtrace);
   return 0;
 }
-])
+]])
 
 ## ------------------------------- ##
 ## btp_backtrace_limit_frame_depth ##
 ## ------------------------------- ##
 AT_TESTFUN([btp_backtrace_limit_frame_depth],
 [[
-#include <lib/backtrace.h>
-#include <lib/thread.h>
-#include <lib/location.h>
-#include <lib/utils.h>
+#include <backtrace.h>
+#include <thread.h>
+#include <location.h>
+#include <utils.h>
 #include <assert.h>
 
 int main(void)
@@ -103,7 +103,7 @@ int main(void)
   /* Load the backtrace from Red Hat Bugzilla bug #621492. */
   struct btp_location location;
   btp_location_init(&location);
-  char *full_input = btp_file_to_string("../../backtraces/621492.bt");
+  char *full_input = btp_file_to_string("../../btparser/backtraces/621492.bt");
   assert(full_input);
   char *input = full_input;
   struct btp_backtrace *backtrace = btp_backtrace_parse(&input, &location);
@@ -129,10 +129,10 @@ int main(void)
 ## ----------------------------- ##
 AT_TESTFUN([btp_backtrace_quality_complex],
 [[
-#include <lib/backtrace.h>
-#include <lib/thread.h>
-#include <lib/location.h>
-#include <lib/utils.h>
+#include <backtrace.h>
+#include <thread.h>
+#include <location.h>
+#include <utils.h>
 #include <assert.h>
 
 int main(void)
@@ -140,7 +140,7 @@ int main(void)
   /* Load the backtrace from Red Hat Bugzilla bug #621492. */
   struct btp_location location;
   btp_location_init(&location);
-  char *full_input = btp_file_to_string("../../backtraces/621492.bt");
+  char *full_input = btp_file_to_string("../../btparser/backtraces/621492.bt");
   assert(full_input);
   char *input = full_input;
   struct btp_backtrace *backtrace = btp_backtrace_parse(&input, &location);
diff --git a/tests/btparser/frame.at b/tests/btparser/frame.at
index 28c34ac5..b9b0e3b4 100644
--- a/tests/btparser/frame.at
+++ b/tests/btparser/frame.at
@@ -8,8 +8,8 @@ AT_BANNER([Frames])
 
 AT_TESTFUN([btp_frame_dup],
 [[
-#include <lib/frame.h>
-#include <lib/utils.h>
+#include <frame.h>
+#include <utils.h>
 #include <assert.h>
 
 int main(void)
@@ -63,7 +63,7 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse_frame_start],
 [[
-#include <lib/frame.h>
+#include <frame.h>
 #include <assert.h>
 
 /**
@@ -111,8 +111,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parseadd_operator],
 [[
-#include <lib/frame.h>
-#include <lib/strbuf.h>
+#include <frame.h>
+#include <strbuf.h>
 #include <assert.h>
 #include <string.h>
 
@@ -155,9 +155,9 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse_function_name],
 [[
-#include <lib/frame.h>
-#include <lib/utils.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <utils.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -217,8 +217,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_skip_function_args],
 [[
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 
 void check(bool success, char *input)
@@ -261,8 +261,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse_function_call],
 [[
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 void check(bool success,
@@ -366,8 +366,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse_address_in_function],
 [[
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 void check(bool success,
@@ -420,8 +420,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse_file_location],
 [[
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 void check(bool success,
@@ -482,8 +482,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse_header],
 [[
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -564,8 +564,8 @@ int main(void)
 
 AT_TESTFUN([btp_frame_parse],
 [[
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/btparser/strbuf.at b/tests/btparser/strbuf.at
index 18535c15..5c0a957a 100644
--- a/tests/btparser/strbuf.at
+++ b/tests/btparser/strbuf.at
@@ -8,7 +8,7 @@ AT_BANNER([strbuf])
 
 AT_TESTFUN([btp_strbuf_append_char],
 [[
-#include <lib/strbuf.h>
+#include <strbuf.h>
 #include <assert.h>
 int main(void)
 {
@@ -36,7 +36,7 @@ int main(void)
 
 AT_TESTFUN([btp_strbuf_append_str],
 [[
-#include <lib/strbuf.h>
+#include <strbuf.h>
 #include <assert.h>
 
 /* Test appending strings of certain length. 'len' must be < 50. */
diff --git a/tests/btparser/thread.at b/tests/btparser/thread.at
index 143a8e1f..c36b796f 100644
--- a/tests/btparser/thread.at
+++ b/tests/btparser/thread.at
@@ -7,10 +7,10 @@ AT_BANNER([Threads])
 ## ----------------------- ##
 AT_TESTFUN([btp_thread_remove_frame],
 [[
-#include <lib/thread.h>
-#include <lib/frame.h>
-#include <lib/location.h>
-#include <lib/utils.h>
+#include <thread.h>
+#include <frame.h>
+#include <location.h>
+#include <utils.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -71,10 +71,10 @@ int main(void)
 ## ------------------------------ ##
 AT_TESTFUN([btp_thread_remove_frames_above],
 [[
-#include <lib/thread.h>
-#include <lib/frame.h>
-#include <lib/location.h>
-#include <lib/utils.h>
+#include <thread.h>
+#include <frame.h>
+#include <location.h>
+#include <utils.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -136,10 +136,10 @@ int main(void)
 ## -------------------------------- ##
 AT_TESTFUN([btp_thread_remove_frames_below_n],
 [[
-#include <lib/thread.h>
-#include <lib/frame.h>
-#include <lib/location.h>
-#include <lib/utils.h>
+#include <thread.h>
+#include <frame.h>
+#include <location.h>
+#include <utils.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -203,9 +203,9 @@ int main(void)
 
 AT_TESTFUN([btp_thread_parse],
 [[
-#include <lib/thread.h>
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <thread.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -285,9 +285,9 @@ int main(void)
 
 AT_TESTFUN([btp_thread_parse-locations],
 [[
-#include <lib/thread.h>
-#include <lib/frame.h>
-#include <lib/location.h>
+#include <thread.h>
+#include <frame.h>
+#include <location.h>
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/tests/btparser/utils.at b/tests/btparser/utils.at
index c12d05fa..13644972 100644
--- a/tests/btparser/utils.at
+++ b/tests/btparser/utils.at
@@ -8,7 +8,7 @@ AT_BANNER([Utils])
 
 AT_TESTFUN([btp_strcmp0],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -28,7 +28,7 @@ int main(void)
 
 AT_TESTFUN([btp_strchr_location],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -64,7 +64,7 @@ int main(void)
 
 AT_TESTFUN([btp_strstr_location],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -104,7 +104,7 @@ int main(void)
 
 AT_TESTFUN([btp_strspn_location],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -137,7 +137,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_char],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -154,7 +154,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_char_limited],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -172,7 +172,7 @@ int main(void)
 
 AT_TESTFUN([btp_parse_char_limited],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -209,7 +209,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_char_sequence],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -227,7 +227,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_char_span],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -249,7 +249,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_char_span_location],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -283,7 +283,7 @@ int main(void)
 
 AT_TESTFUN([btp_parse_char_span],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -307,7 +307,7 @@ int main(void)
 
 AT_TESTFUN([btp_parse_char_cspan],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -331,7 +331,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_string],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -351,7 +351,7 @@ int main(void)
 
 AT_TESTFUN([btp_parse_string],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -371,7 +371,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_unsigned_integer],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -388,7 +388,7 @@ int main(void)
 
 AT_TESTFUN([btp_parse_unsigned_integer],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -407,7 +407,7 @@ int main(void)
 
 AT_TESTFUN([btp_skip_hexadecimal_number],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {
@@ -424,7 +424,7 @@ int main(void)
 
 AT_TESTFUN([btp_parse_hexadecimal_number],
 [[
-#include <lib/utils.h>
+#include <utils.h>
 #include <assert.h>
 int main(void)
 {