summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-08-26 23:00:23 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-08-26 23:00:23 +0000
commite1c80e0df81cec4ccf6a9dd378942d091a0f15dd (patch)
tree78100a859a1bf8fbb9d2166dd0843c49c98c53c3 /test
parent9b696729f05cbeb2e92d86945f280f78cad369c4 (diff)
downloadlibdom-e1c80e0df81cec4ccf6a9dd378942d091a0f15dd.tar.gz
libdom-e1c80e0df81cec4ccf6a9dd378942d091a0f15dd.tar.bz2
Sync with modified libwapcaplet API: 11 additional DOM Level1 testsuite failures. Most importantly, it actually compiles now.
svn path=/trunk/dom/; revision=10717
Diffstat (limited to 'test')
-rw-r--r--test/DOMTSHandler.pm7
-rw-r--r--test/testutils/domts.h4
-rw-r--r--test/testutils/load.c10
3 files changed, 7 insertions, 14 deletions
diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm
index 4e9d304..bc86369 100644
--- a/test/DOMTSHandler.pm
+++ b/test/DOMTSHandler.pm
@@ -363,7 +363,6 @@ sub generate_main {
#include <domts.h>
dom_implementation *doc_impl;
-lwc_context *ctx;
int main(int argc, char **argv)
{
@@ -375,7 +374,7 @@ int main(int argc, char **argv)
if (exp != DOM_NO_ERR)
return exp;
- lerr = lwc_create_context(myrealloc, NULL, &ctx);
+ lerr = lwc_initialise(myrealloc, NULL, 0);
if (lerr != lwc_error_ok)
return -1;
@@ -701,9 +700,9 @@ sub generate_method {
# Add the bootstrap params
if (exists $bootstrap_api{$method}) {
if ($method eq "dom_implementation_create_document") {
- $params = $params.", myrealloc, NULL, ctx, NULL";
+ $params = $params.", myrealloc, NULL, NULL";
} else {
- $params = $params.", myrealloc, NULL, ctx";
+ $params = $params.", myrealloc, NULL";
}
}
# Deal with the situation like
diff --git a/test/testutils/domts.h b/test/testutils/domts.h
index 14f4e9e..6aa8cc4 100644
--- a/test/testutils/domts.h
+++ b/test/testutils/domts.h
@@ -15,10 +15,6 @@
#include <utils.h>
#include <comparators.h>
-struct lwc_context_s;
-
-extern struct lwc_context_s *ctx;
-
dom_document *load_xml(char *file, bool willBeModified);
dom_document *load_html(char *file, bool willBeModified);
diff --git a/test/testutils/load.c b/test/testutils/load.c
index 66e4e4c..0028eb4 100644
--- a/test/testutils/load.c
+++ b/test/testutils/load.c
@@ -24,8 +24,6 @@
#include "utils.h"
-extern lwc_context *ctx;
-
/**
* Load the file as it is a XML file
*
@@ -44,7 +42,7 @@ dom_document *load_xml(char *file, bool willBeModified)
UNUSED(willBeModified);
parser = dom_xml_parser_create(NULL, NULL,
- myrealloc, NULL, mymsg, NULL, ctx);
+ myrealloc, NULL, mymsg, NULL);
if (parser == NULL) {
fprintf(stderr, "Can't create XMLParser\n");
return NULL;
@@ -105,8 +103,8 @@ dom_document *load_html(char *file, bool willBeModified)
UNUSED(willBeModified);
- parser = dom_hubbub_parser_create("data/Aliases", NULL, true,
- myrealloc, NULL, mymsg, NULL, ctx);
+ parser = dom_hubbub_parser_create("../data/Aliases", NULL, true,
+ myrealloc, NULL, mymsg, NULL);
if (parser == NULL) {
fprintf(stderr, "Can't create Hubbub Parser\n");
return NULL;
@@ -115,7 +113,7 @@ dom_document *load_html(char *file, bool willBeModified)
handle = open(file, O_RDONLY);
if (handle == -1) {
dom_hubbub_parser_destroy(parser);
- fprintf(stderr, "Can't open test input file: %s\n", file);
+ /* fprintf(stderr, "Can't open test input file: %s\n", file); */
return NULL;
}