mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-22 06:21:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

make nsurl unit test work again

Browse Source
This commit is contained in:
Vincent Sanders 2015-07-07 00:05:05 +01:00
parent c38670ade8
commit ccfc2aeefa
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -824,3 +824,8 @@ install: all-program install-$(TARGET)
docs: docs:
doxygen Docs/Doxyfile doxygen Docs/Doxyfile
.PHONY:test
test:
make -C test

22
test/Makefile
View File

@ -1,4 +1,7 @@
CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \ #
# NetSurf unit tests
CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I. -I.. \
$(shell pkg-config --cflags libcurl) $(shell pkg-config --cflags libcurl)
LDFLAGS := $(shell pkg-config --libs libcurl) -lz LDFLAGS := $(shell pkg-config --libs libcurl) -lz
@ -8,30 +11,31 @@ llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet libdom)
llcache_SRCS := content/fetch.c content/fetchers/curl.c \ llcache_SRCS := content/fetch.c content/fetchers/curl.c \
content/fetchers/about.c content/fetchers/data.c \ content/fetchers/about.c content/fetchers/data.c \
content/fetchers/resource.c content/llcache.c \ content/fetchers/resource.c content/llcache.c \
content/urldb.c desktop/options.c desktop/version.c \ content/urldb.c desktop/version.c \
image/image_cache.c \ image/image_cache.c \
utils/base64.c utils/corestrings.c utils/hashtable.c \ utils/base64.c utils/corestrings.c utils/hashtable.c \
utils/log.c utils/nsurl.c utils/messages.c utils/url.c \ utils/log.c utils/nsurl.c utils/messages.c utils/url.c \
utils/useragent.c utils/utils.c test/llcache.c utils/useragent.c utils/utils.c test/llcache.c
urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \ urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \
desktop/options.c utils/messages.c utils/hashtable.c \ utils/messages.c utils/hashtable.c \
utils/filename.c utils/nsurl.c utils/corestrings.c \ utils/filename.c utils/nsurl.c utils/corestrings.c \
test/urldbtest.c test/urldbtest.c
urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) -O2 urldbtest_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom libnsutils) -O2
urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom) urldbtest_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom libnsutils)
nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c utils/utf8proc.c test/nsurl.c nsurl_SRCS := utils/corestrings.c utils/log.c utils/nsurl.c utils/idna.c desktop/version.c test/nsurl.c
nsurl_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom) nsurl_CFLAGS := $(shell pkg-config --cflags libwapcaplet libdom libutf8proc)
nsurl_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom) nsurl_LDFLAGS := $(shell pkg-config --libs libwapcaplet libdom libutf8proc)
nsoption_SRCS := utils/log.c utils/nsoption.c test/nsoption.c nsoption_SRCS := utils/log.c utils/nsoption.c test/nsoption.c
nsoption_CFLAGS := -Dnsgtk nsoption_CFLAGS := -Dnsgtk
.PHONY: all .PHONY: all
all: llcache urldbtest nsurl nsoption all: nsurl
./nsurl
llcache: $(addprefix ../,$(llcache_SRCS)) llcache: $(addprefix ../,$(llcache_SRCS))
$(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS) $(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS)

1
test/llcache.c
View File

@ -26,7 +26,6 @@
#include "content/llcache.h" #include "content/llcache.h"
#include "utils/ring.h" #include "utils/ring.h"
#include "utils/nsurl.h" #include "utils/nsurl.h"
#include "utils/schedule.h"
#include "utils/url.h" #include "utils/url.h"
#include "utils/corestrings.h" #include "utils/corestrings.h"
#include "utils/utils.h" #include "utils/utils.h"

3
test/nsurl.c
View File

@ -213,7 +213,7 @@ static const struct test_triplets replace_query_tests[] = {
/** /**
* Test nsurl * Test nsurl
*/ */
int main(void) int main(int argc, char **argv)
{ {
nsurl *base; nsurl *base;
nsurl *joined; nsurl *joined;
@ -227,6 +227,7 @@ int main(void)
nserror err; nserror err;
verbose_log = true; verbose_log = true;
nslog_init(NULL, &argc, argv);
if (corestrings_init() != NSERROR_OK) { if (corestrings_init() != NSERROR_OK) {
assert(0 && "Failed to init corestrings."); assert(0 && "Failed to init corestrings.");

0
test/testament.h Normal file
View File

1
test/urldbtest.c
View File

@ -29,6 +29,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "utils/errors.h"
#include "image/bitmap.h" #include "image/bitmap.h"
#include "content/content.h" #include "content/content.h"
#include "content/urldb.h" #include "content/urldb.h"