Fix default XML file generated by tests

Fixes #888.

--
MOS_MIGRATED_REVID=114671702
diff --git a/tools/test/test-setup.sh b/tools/test/test-setup.sh
index c5df493..6fa814a 100755
--- a/tools/test/test-setup.sh
+++ b/tools/test/test-setup.sh
@@ -55,15 +55,17 @@
   # Create a default XML output file if the test runner hasn't generated it
   if (( $exitCode != 0 )); then
     errors=1
-    error_msg="<error message=\"exited with error code $exitCode\"/></error>"
+    error_msg="<error message=\"exited with error code $exitCode\"></error>"
   else
     errors=0
     error_msg=
   fi
   cat <<EOF >${XML_OUTPUT_FILE}
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="$1" tests="1" failure="0" errors="$errors">
-  <testcase name="$1" status="run">$error_msg</testcase>
+<testsuites>
+  <testsuite name="$1" tests="1" failures="0" errors="$errors">
+    <testcase name="$1" status="run">$error_msg</testcase>
+  </testsuite>
 </testsuites>
 EOF
 fi