Merge remote-tracking branch 'origin/master' into svenw/cocoa

6 files changed, 22 insertions, 36 deletions

diff --git a/test/Makefile b/test/Makefile
index 39953a3d3..64c3f39a4 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -134,7 +134,7 @@ endif
 
 BASE_TESTCFLAGS := -std=c99 -g \
 	$(COMMON_WARNFLAGS) \
-	-D_BSD_SOURCE \
+	-D_DEFAULT_SOURCE \
 	-D_POSIX_C_SOURCE=200809L \
 	-D_XOPEN_SOURCE=600 \
 	-Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \
diff --git a/test/data/Choices-all b/test/data/Choices-all
index b9cab1fb3..9f2e18377 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -95,6 +95,8 @@ sys_colour_ThreeDShadow:d5d5d5
 sys_colour_Window:f1f1f1
 sys_colour_WindowFrame:4e4e4e
 sys_colour_WindowText:000000
+log_filter:level:WARNING
+verbose_filter:level:VERBOSE
 render_resample:1
 downloads_clear:0
 request_overwrite:1
diff --git a/test/log.c b/test/log.c
index 90b4379e9..fc6b6285c 100644
--- a/test/log.c
+++ b/test/log.c
@@ -42,13 +42,15 @@ void nslog_log(const char *file, const char *func, int ln, const char *format, .
 {
 	va_list ap;
 
-	fprintf(stderr, "%s:%i %s: ", file, ln, func);
+	if (verbose_log) {
+		fprintf(stderr, "%s:%i %s: ", file, ln, func);
 
-	va_start(ap, format);
+		va_start(ap, format);
 
-	vfprintf(stderr, format, ap);
+		vfprintf(stderr, format, ap);
 
-	va_end(ap);
+		va_end(ap);
 
-	fputc('\n', stderr);
+		fputc('\n', stderr);
+	}
 }
diff --git a/test/messages.c b/test/messages.c
index d102e361c..ae82d1ede 100644
--- a/test/messages.c
+++ b/test/messages.c
@@ -52,7 +52,6 @@ struct message_test_vec_s message_errorcode_test_vec[] = {
 	{ NSERROR_SAVE_FAILED, "SaveFailed" },
 	{ NSERROR_CLONE_FAILED, "CloneFailed" },
 	{ NSERROR_INIT_FAILED, "InitFailed" },
-	{ NSERROR_MNG_ERROR, "Error converting MNG/PNG/JNG: %i" },
 	{ NSERROR_BAD_ENCODING, "BadEncoding" },
 	{ NSERROR_NEED_DATA, "NeedData" },
 	{ NSERROR_ENCODING_CHANGE, "EncodingChanged" },
diff --git a/test/nsoption.c b/test/nsoption.c
index 5874c94b6..8f2388a5b 100644
--- a/test/nsoption.c
+++ b/test/nsoption.c
@@ -39,6 +39,9 @@ const char *test_choices_all_path = "test/data/Choices-all";
 const char *test_choices_full_path = "test/data/Choices-full";
 const char *test_choices_missing_path = "test/data/Choices-missing";
 
+/* Stubs */
+nserror nslog_set_filter_by_options() { return NSERROR_OK; }
+
 /**
  * generate test output filenames
  */
diff --git a/test/urldbtest.c b/test/urldbtest.c
index 75a7210b0..1c76de1ee 100644
--- a/test/urldbtest.c
+++ b/test/urldbtest.c
@@ -77,6 +77,9 @@ struct test_urls {
 #define NELEMS(x)  (sizeof(x) / sizeof((x)[0]))
 
 
+/* Stubs */
+nserror nslog_set_filter_by_options() { return NSERROR_OK; }
+
 /**
  * generate test output filenames
  */
@@ -143,7 +146,7 @@ static nsurl *make_url(const char *url)
 {
 	nsurl *nsurl;
 	if (nsurl_create(url, &nsurl) != NSERROR_OK) {
-		LOG("failed creating nsurl");
+		NSLOG(netsurf, INFO, "failed creating nsurl");
 		exit(1);
 	}
 	return nsurl;
@@ -229,9 +232,8 @@ static void urldb_lwc_iterator(lwc_string *str, void *pw)
 {
 	int *scount = pw;
 
-	LOG("[%3u] %.*s", str->refcnt,
-	    (int)lwc_string_length(str),
-	    lwc_string_data(str));
+	NSLOG(netsurf, INFO, "[%3u] %.*s", str->refcnt,
+	      (int)lwc_string_length(str), lwc_string_data(str));
 	(*scount)++;
 }
 
@@ -245,7 +247,7 @@ static void urldb_teardown(void)
 
 	corestrings_fini();
 
-	LOG("Remaining lwc strings:");
+	NSLOG(netsurf, INFO, "Remaining lwc strings:");
 	lwc_iterate_strings(urldb_lwc_iterator, &scount);
 	ck_assert_int_eq(scount, 0);
 }
@@ -712,7 +714,7 @@ static int cb_count;
 
 static bool urldb_iterate_entries_cb(nsurl *url, const struct url_data *data)
 {
-	LOG("url: %s", nsurl_access(url));
+	NSLOG(netsurf, INFO, "url: %s", nsurl_access(url));
 	/* fprintf(stderr, "url:%s\ntitle:%s\n\n",nsurl_access(url), data->title); */
 	cb_count++;
 	return true;
@@ -867,27 +869,6 @@ START_TEST(urldb_auth_details_test)
 END_TEST
 
 
-START_TEST(urldb_thumbnail_test)
-{
-	nsurl *url;
-	struct bitmap *bmap;
-	struct bitmap *res;
-	bool set;
-
-	url = make_url(wikipedia_url);
-	bmap = (struct bitmap*)url;
-
-	set = urldb_set_thumbnail(url, bmap);
-	ck_assert(set == true);
-
-	res = urldb_get_thumbnail(url);
-	ck_assert(res != NULL);
-	ck_assert(res == bmap);
-
-	nsurl_unref(url);
-}
-END_TEST
-
 START_TEST(urldb_cert_permissions_test)
 {
 	nsurl *url;
@@ -983,7 +964,6 @@ static TCase *urldb_case_create(void)
 	tcase_add_test(tc, urldb_iterate_partial_numeric_v4_test);
 	tcase_add_test(tc, urldb_iterate_partial_numeric_v6_test);
 	tcase_add_test(tc, urldb_auth_details_test);
-	tcase_add_test(tc, urldb_thumbnail_test);
 	tcase_add_test(tc, urldb_cert_permissions_test);
 	tcase_add_test(tc, urldb_update_visit_test);
 	tcase_add_test(tc, urldb_reset_visit_test);
@@ -995,7 +975,7 @@ static TCase *urldb_case_create(void)
 
 static bool urldb_iterate_cookies_cb(const struct cookie_data *data)
 {
-	LOG("%p", data);
+	NSLOG(netsurf, INFO, "%p", data);
 	/* fprintf(stderr, "domain:%s\npath:%s\nname:%s\n\n",data->domain, data->path, data->name);*/
 	return true;
 }