btparser integration: use ABRT's strbuf instead of internal one

6 files changed, 19 insertions, 19 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58cd2b3e..7903a30b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,8 @@ EXTRA_DIST = package.m4
 
 TESTSUITE_AT = 	\
   local.at 	\
-  testsuite.at
+  testsuite.at  \
+  strbuf.at
 
 EXTRA_DIST += $(TESTSUITE_AT)
 TESTSUITE = $(srcdir)/testsuite
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 2d148968..62cba99d 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -6,7 +6,7 @@ CC='@CC@'
 LIBTOOL="$abs_top_builddir/libtool"
 
 # We want no optimization.
-CFLAGS="@O0CFLAGS@ -I$abs_top_builddir/src/btparser -D_GNU_SOURCE"
+CFLAGS="@O0CFLAGS@ -I$abs_top_builddir/src/btparser -I$abs_top_builddir/lib/utils -D_GNU_SOURCE"
 
 # Are special link options needed?
 LDFLAGS="@LDFLAGS@ $abs_top_builddir/src/btparser/libbtparser.la"
diff --git a/tests/btparser/Makefile.am b/tests/btparser/Makefile.am
index 57805452..5dd52e2a 100644
--- a/tests/btparser/Makefile.am
+++ b/tests/btparser/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = backtraces
 
 TESTSUITE_AT = 	\
   utils.at 	\
-  strbuf.at 	\
   frame.at 	\
   thread.at 	\
   backtrace.at
diff --git a/tests/btparser/frame.at b/tests/btparser/frame.at
index b9b0e3b4..92bcc652 100644
--- a/tests/btparser/frame.at
+++ b/tests/btparser/frame.at
@@ -112,7 +112,7 @@ int main(void)
 AT_TESTFUN([btp_frame_parseadd_operator],
 [[
 #include <frame.h>
-#include <strbuf.h>
+#include "strbuf.h"
 #include <assert.h>
 #include <string.h>
 
@@ -120,7 +120,7 @@ void check(char *input, int parsed_length)
 {
   printf("Testing '%s' -> %d\n", input, parsed_length);
   char *old_input = input;
-  struct btp_strbuf *strbuf = btp_strbuf_new();
+  struct strbuf *strbuf = strbuf_new();
   assert(parsed_length == btp_frame_parseadd_operator(&input, strbuf));
   printf("  input = '%s', old_input = '%s'\n", input, old_input);
 
@@ -131,7 +131,7 @@ void check(char *input, int parsed_length)
   assert(0 == strncmp(strbuf->buf, old_input, parsed_length));
   assert(strbuf->len == parsed_length);
 
-  btp_strbuf_free(strbuf);
+  strbuf_free(strbuf);
 }
 
 int main(void)
diff --git a/tests/btparser/strbuf.at b/tests/strbuf.at
index 5c0a957a..d2db8b9c 100644
--- a/tests/btparser/strbuf.at
+++ b/tests/strbuf.at
@@ -3,40 +3,40 @@
 AT_BANNER([strbuf])
 
 ## ---------------------- ##
-## btp_strbuf_append_char ##
+## strbuf_append_char ##
 ## ---------------------- ##
 
-AT_TESTFUN([btp_strbuf_append_char],
+AT_TESTFUN([strbuf_append_char],
 [[
-#include <strbuf.h>
+#include "strbuf.h"
 #include <assert.h>
 int main(void)
 {
   int i;
-  struct btp_strbuf *strbuf = btp_strbuf_new();
+  struct strbuf *strbuf = strbuf_new();
   for (i = 0; i < 100; ++i)
   {
     assert(strbuf->len == i);
     assert(strbuf->alloc > strbuf->len);
     assert(strbuf->buf[i] == '\0');
-    btp_strbuf_append_char(strbuf, 'a');
+    strbuf_append_char(strbuf, 'a');
     assert(strbuf->buf[i] == 'a');
     assert(strbuf->buf[i+1] == '\0');
     assert(strbuf->len == i + 1);
     assert(strbuf->alloc > strbuf->len);
   }
-  btp_strbuf_free(strbuf);
+  strbuf_free(strbuf);
   return 0;
 }
 ]])
 
 ## --------------------- ##
-## btp_strbuf_append_str ##
+## strbuf_append_str ##
 ## --------------------- ##
 
-AT_TESTFUN([btp_strbuf_append_str],
+AT_TESTFUN([strbuf_append_str],
 [[
-#include <strbuf.h>
+#include "strbuf.h"
 #include <assert.h>
 
 /* Test appending strings of certain length. 'len' must be < 50. */
@@ -48,19 +48,19 @@ void test(int len)
     str[i] = 'a';
   str[i] = '\0';
 
-  struct btp_strbuf *strbuf = btp_strbuf_new();
+  struct strbuf *strbuf = strbuf_new();
   for (i = 0; i < 100; ++i)
   {
     assert(strbuf->len == i*len);
     assert(strbuf->alloc > strbuf->len);
     assert(strbuf->buf[i*len] == '\0');
-    btp_strbuf_append_str(strbuf, str);
+    strbuf_append_str(strbuf, str);
     assert(strbuf->buf[i*len] == str[0]);
     assert(strbuf->buf[i*len+len] == '\0');
     assert(strbuf->len == i*len + len);
     assert(strbuf->alloc > strbuf->len);
   }
-  btp_strbuf_free(strbuf);
+  strbuf_free(strbuf);
 }
 
 int main(void)
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 24c2a2b6..0ddf595d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,8 +1,8 @@
 # Test suite for abrt.
 # See http://www.gnu.org/software/hello/manual/autoconf/Writing-Testsuites.html
 
+m4_include([strbuf.at])
 m4_include([btparser/utils.at])
-m4_include([btparser/strbuf.at])
 m4_include([btparser/frame.at])
 m4_include([btparser/thread.at])
 m4_include([btparser/backtrace.at])