URI work cleanup and regresssion tests,

- uri.c testUri.c: applied Wayne Davidson patches
- test/URI/uri.data result/URI/uri.data: first set of tests/results
- Makefile.in: added URItest and included thenin "make tests"
Daniel

1 files changed, 16 insertions, 9 deletions

diff --git a/testURI.c b/testURI.c
index 50b508e2..349ca028 100644
--- a/testURI.c
+++ b/testURI.c
@@ -58,17 +58,24 @@ int main(int argc, char **argv) {
 		i--;
 		str[i] = 0;
 	    }
-	    if (i <= 0)
-		continue;
 
-	    ret = xmlParseURIReference(uri, str);
-	    if (ret != 0)
-		printf("%s : error %d\n", str, ret);
-	    else {
-		xmlPrintURI(stdout, uri);
-		printf("\n");
+	    if (base == NULL) {
+		ret = xmlParseURIReference(uri, str);
+		if (ret != 0)
+		    printf("%s : error %d\n", str, ret);
+		else {
+		    xmlPrintURI(stdout, uri);
+		    printf("\n");
+		}
+	    } else {
+		composite = xmlBuildURI((xmlChar *)str, (xmlChar *) base);
+		if (composite != NULL) {
+		    printf("%s\n", composite);
+		    xmlFree(composite);
+		}
+		else
+		    printf("::ERROR::\n");
 	    }
-
         }
     } else {
 	while (argv[arg] != NULL) {