From ca4dfc7f1e5e06ca55c854ca293bcd935040eda0 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 14 Oct 2011 21:29:13 +0000 Subject: Move nsurl test suite into test/ Fix up llcache tester to reflect nsurl changes Make handling of http:,http:/,http:// consistent Fix buffer overflow when presented with an input string: "http://" svn path=/trunk/netsurf/; revision=13051 --- test/Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index 6e1c2d3f0..283f4bb16 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,10 +5,12 @@ LDFLAGS := `pkg-config --libs libxml-2.0 libcurl` llcache_CFLAGS := `pkg-config --cflags libparserutils libwapcaplet` llcache_LDFLAGS := `pkg-config --libs libparserutils libwapcaplet` -llcache_SRCS := content/fetch.c content/fetchers/fetch_curl.c \ - content/fetchers/fetch_data.c content/llcache.c \ +llcache_SRCS := content/fetch.c content/fetchers/curl.c \ + content/fetchers/about.c content/fetchers/data.c \ + content/fetchers/resource.c content/llcache.c \ content/urldb.c desktop/options.c desktop/version.c \ - utils/base64.c utils/hashtable.c utils/log.c \ + image/image_cache.c \ + utils/base64.c utils/hashtable.c utils/log.c utils/nsurl.c \ utils/messages.c utils/url.c utils/useragent.c utils/utf8.c \ utils/utils.c test/llcache.c @@ -19,9 +21,13 @@ urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/log.c \ urldbtest_CFLAGS := -O2 urldbtest_LDFLAGS := +nsurl_SRCS := utils/hashtable.c utils/log.c utils/messages.c utils/nsurl.c utils/utils.c test/nsurl.c +nsurl_CFLAGS := `pkg-config --cflags libwapcaplet` +nsurl_LDFLAGS := `pkg-config --libs libwapcaplet` + .PHONY: all -all: llcache urldbtest +all: llcache urldbtest nsurl llcache: $(addprefix ../,$(llcache_SRCS)) $(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS) @@ -29,7 +35,10 @@ llcache: $(addprefix ../,$(llcache_SRCS)) urldbtest: $(addprefix ../,$(urldbtest_SRCS)) $(CC) $(CFLAGS) $(urldbtest_CFLAGS) $^ -o $@ $(LDFLAGS) $(urldbtest_LDFLAGS) +nsurl: $(addprefix ../,$(nsurl_SRCS)) + $(CC) $(CFLAGS) $(nsurl_CFLAGS) $^ -o $@ $(LDFLAGS) $(nsurl_LDFLAGS) + .PHONY: clean clean: - $(RM) llcache urldbtest + $(RM) llcache urldbtest nsurl -- cgit v1.2.3