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

3 files changed, 3 insertions, 77 deletions

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/btparser/strbuf.at
deleted file mode 100644
index 5c0a957a..00000000
--- a/tests/btparser/strbuf.at
+++ /dev/null
@@ -1,73 +0,0 @@
-# Checking the btparser. -*- Autotest -*-
-
-AT_BANNER([strbuf])
-
-## ---------------------- ##
-## btp_strbuf_append_char ##
-## ---------------------- ##
-
-AT_TESTFUN([btp_strbuf_append_char],
-[[
-#include <strbuf.h>
-#include <assert.h>
-int main(void)
-{
-  int i;
-  struct btp_strbuf *strbuf = btp_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');
-    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);
-  return 0;
-}
-]])
-
-## --------------------- ##
-## btp_strbuf_append_str ##
-## --------------------- ##
-
-AT_TESTFUN([btp_strbuf_append_str],
-[[
-#include <strbuf.h>
-#include <assert.h>
-
-/* Test appending strings of certain length. 'len' must be < 50. */
-void test(int len)
-{
-  int i;
-  char str[50];
-  for (i = 0; i < len; ++i)
-    str[i] = 'a';
-  str[i] = '\0';
-
-  struct btp_strbuf *strbuf = btp_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);
-    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);
-}
-
-int main(void)
-{
-  int i;
-  for (i = 0; i < 50; ++i)
-    test(i);
-  return 0;
-}
-]])