4 files changed, 35 insertions, 3 deletions
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 94c38d4d48..55b6d1844c 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
      {ticket_tests, [],
       [ticket_5998, ticket_7211, ticket_7214, ticket_7430,
        ticket_6873, ticket_7496, ticket_8156, ticket_8697,
-       ticket_9411, ticket_9457]},
+       ticket_9411, ticket_9457, ticket_9664_schema, ticket_9664_dtd]},
      {app_test, [], [{xmerl_app_test, all}]},
      {appup_test, [], [{xmerl_appup_test, all}]}].
 
@@ -284,7 +284,7 @@ export(Config) ->
     ?line {E,_} = xmerl_scan:file(TestFile),
     ?line Exported = xmerl:export([E],xmerl_xml,[{prolog,Prolog}]),
     B = list_to_binary(Exported++"\n"),
-    ?line {ok,B} = file:read_file(TestFile),
+    ?line {ok, B} = file:read_file(TestFile),
     ok.
 
 %%----------------------------------------------------------------------
@@ -609,6 +609,38 @@ ticket_9457_cont(Continue, Exception, GlobalState) ->
 	    Exception(GlobalState)
     end.
 
+
+ticket_9664_schema(suite) -> [];
+ticket_9664_schema(doc) -> 
+    ["Test that comments are handled correct whith"];
+ticket_9664_schema(Config) ->
+
+    ?line {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config), misc,
+						  "ticket_9664_schema.xml"]),[]),
+    ?line {ok, S} = xmerl_xsd:process_schema(filename:join([?config(data_dir, Config), misc,
+							    "motorcycles.xsd"])),
+    ?line {E1, _} = xmerl_xsd:validate(E, S),
+
+    ?line {E1,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), misc,
+							    "motorcycles.xsd"]),E,[]),
+
+    ?line {E1,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),  misc,
+						 "ticket_9664_schema.xml"]), 
+				  [{schemaLocation, [{"mc", "motorcycles.xsd"}]},
+				   {validation, schema}]),
+    ok.
+
+ticket_9664_dtd(suite) -> [];
+ticket_9664_dtd(doc) -> 
+    ["Test that comments are handled correct whith"];
+ticket_9664_dtd(Config) ->
+    ?line {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config),  misc,
+						  "ticket_9664_dtd.xml"]),[]),
+    ?line {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config),  misc,
+						  "ticket_9664_dtd.xml"]),[{validation, true}]),
+    ok.
+
+
 %%======================================================================
 %% Support Functions
 %%======================================================================
diff --git a/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz b/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz
index fef7431845..ffc1d327a5 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz
+++ b/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
index 850b7f8135..7b6f1e95b3 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
@@ -210,7 +210,7 @@ ticket_7496() ->
     ?line {Doc3,_} = xmerl_scan:file("documentRoot.xml"),
     ?line ok = Test(Doc3,"//child",[child,child,child]),
     ?line ok = Test(Doc3,"//child[@name='beta']",[child]),
-    ?line [{xmlAttribute,id,[],[],[],[],1,[],"2",false}] =
+    ?line [{xmlAttribute,id,[],[],[],_,1,[],"2",false}] =
 	xmerl_xpath:string("/documentRoot/parent/child[@name='beta']/@id",Doc3),
     ?line ok = Test(Doc3,"/documentRoot/parent/child|/documentRoot/parent/pet",
 		    [child,child,child,pet,pet]),
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd b/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd
index 057344cde8..057344cde8 100755..100644
--- a/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd
+++ b/lib/xmerl/test/xmerl_xsd_SUITE_data/mim.xsd