141 $temp_path =~ s/\/summary\/.*//; |
142 $temp_path =~ s/\/summary\/.*//; |
142 if (defined($ats3_report)) { $detailshref = $ats3_report }; |
143 if (defined($ats3_report)) { $detailshref = $ats3_report }; |
143 if (defined($ats4_report)) { $detailshref = $ats4_report }; |
144 if (defined($ats4_report)) { $detailshref = $ats4_report }; |
144 $detailshref =~ s/\\/\//g; # Replace \ with / |
145 $detailshref =~ s/\\/\//g; # Replace \ with / |
145 $detailshref =~ s/($temp_path)/../; |
146 $detailshref =~ s/($temp_path)/../; |
|
147 if (defined($test_report)) { |
|
148 $man_detailshref = $test_report; |
|
149 $man_detailshref =~ s/\\/\//g; # Replace \ with / |
|
150 $man_detailshref =~ s/($temp_path)/../; |
|
151 } |
146 |
152 |
147 if (defined($test_report)) { # Get manual Smoketest results. |
153 if (defined($test_report)) { # Get manual Smoketest results. |
148 print "Parsing " . $test_report . "... "; |
154 print "Parsing " . $test_report . "... "; |
149 $xml_report = XMLin("$test_report", keeproot => 1, forcearray => [ 'test-set', 'test-case' ], keyattr => [] ); |
155 $xml_report = XMLin("$test_report", keeproot => 1, forcearray => [ 'test-set', 'test-case' ], keyattr => [] ); |
150 print "complete \n"; |
156 print "complete \n"; |
203 splice @lines, $n, 0, "<nestedtests count=\"$auto_tests_passed\" property=\"passed\"/>"; $n++; |
209 splice @lines, $n, 0, "<nestedtests count=\"$auto_tests_passed\" property=\"passed\"/>"; $n++; |
204 splice @lines, $n, 0, "<nestedtests count=\"$auto_tests_failed\" property=\"failed\"/>"; $n++; |
210 splice @lines, $n, 0, "<nestedtests count=\"$auto_tests_failed\" property=\"failed\"/>"; $n++; |
205 splice @lines, $n, 0, "<nestedtests count=\"$auto_tests_notrun\" property=\"not run\"/>"; $n++; |
211 splice @lines, $n, 0, "<nestedtests count=\"$auto_tests_notrun\" property=\"not run\"/>"; $n++; |
206 splice @lines, $n, 0, "<\/step>"; $n++; |
212 splice @lines, $n, 0, "<\/step>"; $n++; |
207 if (defined($test_report)) { |
213 if (defined($test_report)) { |
208 splice @lines, $n, 0, "<step name=\"Smoketest - manual tests\">"; $n++; |
214 splice @lines, $n, 0, "<step detailshref=\"$man_detailshref\" name=\"Smoketest - manual tests\">"; $n++; |
209 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_total\" property=\"total\"/>"; $n++; |
215 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_total\" property=\"total\"/>"; $n++; |
210 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_passed\" property=\"passed\"/>"; $n++; |
216 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_passed\" property=\"passed\"/>"; $n++; |
211 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_failed\" property=\"failed\"/>"; $n++; |
217 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_failed\" property=\"failed\"/>"; $n++; |
212 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_notrun\" property=\"not run\"/>"; $n++; |
218 splice @lines, $n, 0, "<nestedtests count=\"$man_tests_notrun\" property=\"not run\"/>"; $n++; |
213 splice @lines, $n, 0, "<\/step>"; $n++; |
219 splice @lines, $n, 0, "<\/step>"; $n++; |
233 print FILE "<nestedtests count=\"$auto_tests_passed\" property=\"passed\"/>\n"; |
239 print FILE "<nestedtests count=\"$auto_tests_passed\" property=\"passed\"/>\n"; |
234 print FILE "<nestedtests count=\"$auto_tests_failed\" property=\"failed\"/>\n"; |
240 print FILE "<nestedtests count=\"$auto_tests_failed\" property=\"failed\"/>\n"; |
235 print FILE "<nestedtests count=\"$auto_tests_notrun\" property=\"not run\"/>\n"; |
241 print FILE "<nestedtests count=\"$auto_tests_notrun\" property=\"not run\"/>\n"; |
236 print FILE "<\/step>\n"; |
242 print FILE "<\/step>\n"; |
237 if (defined($test_report)) { |
243 if (defined($test_report)) { |
238 print FILE "<step name=\"Smoketest - manual tests\">\n"; |
244 print FILE "<step detailshref=\"$man_detailshref\" name=\"Smoketest - manual tests\">\n"; |
239 print FILE "<nestedtests count=\"$man_tests_total\" property=\"total\"/>\n"; |
245 print FILE "<nestedtests count=\"$man_tests_total\" property=\"total\"/>\n"; |
240 print FILE "<nestedtests count=\"$man_tests_passed\" property=\"passed\"/>\n"; |
246 print FILE "<nestedtests count=\"$man_tests_passed\" property=\"passed\"/>\n"; |
241 print FILE "<nestedtests count=\"$man_tests_failed\" property=\"failed\"/>\n"; |
247 print FILE "<nestedtests count=\"$man_tests_failed\" property=\"failed\"/>\n"; |
242 print FILE "<nestedtests count=\"$man_tests_notrun\" property=\"not run\"/>\n"; |
248 print FILE "<nestedtests count=\"$man_tests_notrun\" property=\"not run\"/>\n"; |
243 print FILE "<\/step>\n"; |
249 print FILE "<\/step>\n"; |