diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-12-04 15:28:50 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-12-04 15:28:50 +0000 |
commit | 2fee3114b46682b220c73aae7c4f2466dedb81ff (patch) | |
tree | d9dc3de599ec43fdf5cf70b59ac1fd049672914e /test/regression | |
parent | d485dbd52ebc6a911a5ddcf6891212fccb82e8c0 (diff) | |
download | libparserutils-2fee3114b46682b220c73aae7c4f2466dedb81ff.tar.gz libparserutils-2fee3114b46682b220c73aae7c4f2466dedb81ff.tar.bz2 |
Remove init/final code and turn aliases into static data structure. r=vince
svn path=/trunk/libparserutils/; revision=10961
Diffstat (limited to 'test/regression')
-rw-r--r-- | test/regression/INDEX | 1 | ||||
-rw-r--r-- | test/regression/Makefile | 2 | ||||
-rw-r--r-- | test/regression/cscodec-segv.c | 38 | ||||
-rw-r--r-- | test/regression/filter-badenc-segv.c | 5 | ||||
-rw-r--r-- | test/regression/filter-segv.c | 5 | ||||
-rw-r--r-- | test/regression/stream-nomem.c | 5 |
6 files changed, 1 insertions, 55 deletions
diff --git a/test/regression/INDEX b/test/regression/INDEX index 135e761..f6de6cf 100644 --- a/test/regression/INDEX +++ b/test/regression/INDEX @@ -2,7 +2,6 @@ # # Test Description DataDir -cscodec-segv Segfault in charset codecs filter-segv Segfault in input filtering stream-nomem Inputstream buffer expansion filter-badenc-segv Segfault on resetting bad encoding in filter diff --git a/test/regression/Makefile b/test/regression/Makefile index 0799ea4..2cdeaf7 100644 --- a/test/regression/Makefile +++ b/test/regression/Makefile @@ -1,5 +1,5 @@ # Tests -DIR_TEST_ITEMS := cscodec-segv:cscodec-segv.c filter-segv:filter-segv.c \ +DIR_TEST_ITEMS := filter-segv:filter-segv.c \ stream-nomem:stream-nomem.c filter-badenc-segv:filter-badenc-segv.c CFLAGS := $(CFLAGS) -I$(CURDIR)/test diff --git a/test/regression/cscodec-segv.c b/test/regression/cscodec-segv.c deleted file mode 100644 index 0cf9f69..0000000 --- a/test/regression/cscodec-segv.c +++ /dev/null @@ -1,38 +0,0 @@ -#include <stdio.h> - -#include "charset/charset.h" -#include <parserutils/charset/codec.h> - -#include "testutils.h" - -static void *myrealloc(void *ptr, size_t len, void *pw) -{ - UNUSED(pw); - - return realloc(ptr, len); -} - -int main(int argc, char **argv) -{ - parserutils_charset_codec *codec; - - if (argc != 2) { - printf("Usage: %s <aliases_file>\n", argv[0]); - return 1; - } - - assert(parserutils_charset_initialise(argv[1], myrealloc, NULL) == - PARSERUTILS_OK); - - assert(parserutils_charset_codec_create("UTF-8", myrealloc, NULL, - &codec) == PARSERUTILS_OK); - - parserutils_charset_codec_destroy(codec); - - assert(parserutils_charset_finalise(myrealloc, NULL) == - PARSERUTILS_OK); - - printf("PASS\n"); - - return 0; -} diff --git a/test/regression/filter-badenc-segv.c b/test/regression/filter-badenc-segv.c index 09ae864..0c9877a 100644 --- a/test/regression/filter-badenc-segv.c +++ b/test/regression/filter-badenc-segv.c @@ -31,9 +31,6 @@ int main(int argc, char **argv) return 1; } - assert(parserutils_initialise(argv[1], myrealloc, NULL) == - PARSERUTILS_OK); - assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) == PARSERUTILS_OK); @@ -49,8 +46,6 @@ int main(int argc, char **argv) parserutils_filter_destroy(input); - assert(parserutils_finalise(myrealloc, NULL) == PARSERUTILS_OK); - printf("PASS\n"); return 0; diff --git a/test/regression/filter-segv.c b/test/regression/filter-segv.c index a884b6d..58905f9 100644 --- a/test/regression/filter-segv.c +++ b/test/regression/filter-segv.c @@ -23,16 +23,11 @@ int main(int argc, char **argv) return 1; } - assert(parserutils_initialise(argv[1], myrealloc, NULL) == - PARSERUTILS_OK); - assert(parserutils_filter_create("UTF-8", myrealloc, NULL, &input) == PARSERUTILS_OK); parserutils_filter_destroy(input); - assert(parserutils_finalise(myrealloc, NULL) == PARSERUTILS_OK); - printf("PASS\n"); return 0; diff --git a/test/regression/stream-nomem.c b/test/regression/stream-nomem.c index fc8d514..2f7707e 100644 --- a/test/regression/stream-nomem.c +++ b/test/regression/stream-nomem.c @@ -49,9 +49,6 @@ int main(int argc, char **argv) input_buffer[BUFFER_SIZE - 7] = '2'; input_buffer[BUFFER_SIZE - 8] = '1'; - assert(parserutils_initialise(argv[1], myrealloc, NULL) == - PARSERUTILS_OK); - assert(parserutils_inputstream_create("UTF-8", 0, NULL, myrealloc, NULL, &stream) == PARSERUTILS_OK); @@ -84,8 +81,6 @@ int main(int argc, char **argv) parserutils_inputstream_destroy(stream); - assert(parserutils_finalise(myrealloc, NULL) == PARSERUTILS_OK); - printf("PASS\n"); return 0; |