|
89 | 89 | <antcall target="runtest"> |
90 | 90 | <param name="testng.xml" value="testng/testng_wd.xml"/> </antcall> |
91 | 91 | <antcall target="undeploy"/> |
92 | | - <antcall target="quicklook-summary"/> |
| 92 | + <antcall target="quicklook-summary_wd"/> |
93 | 93 | <antcall target="stop-server"/> |
94 | 94 | <antcall target="stop-derby"/> |
95 | 95 | <copy file="test-output/emailable-report.html" tofile="test-output/QL-WP-report.html"/> |
|
109 | 109 | <antcall target="runtest"> |
110 | 110 | <param name="testng.xml" value="testng/testng_wd.xml"/> </antcall> |
111 | 111 | <antcall target="undeploy"/> |
112 | | - <antcall target="quicklook-summary"/> |
| 112 | + <antcall target="quicklook-summary_wd"/> |
113 | 113 |
|
114 | 114 | <antcall target="remove-quicklook-policy-grants" /> |
115 | 115 | <antcall target="stop_server_with_security_manager_enabled" /> |
|
505 | 505 | </loadfile> |
506 | 506 | <echo message="${testng_output}"/> |
507 | 507 | </target> |
508 | | - |
| 508 | + <!-- added few messages in order to show testng summary of wsit related tests along with final summary as wsit tests are ran seperately as a workaround for GLASSFISH-21672 --> |
509 | 509 | <target name="quicklook-summary"> |
510 | 510 | <tstamp> |
511 | 511 | <format property="end.timestamp" pattern="EE MM/dd/yyyy HH:mm:ss zz" /> |
|
518 | 518 | <replacestring from="[testng]" to=""/> |
519 | 519 | </tokenfilter> |
520 | 520 | </filterchain> |
| 521 | + </loadfile> |
| 522 | + <loadfile srcfile="wsit/JaxwsFromWsdl/wsit1run.output" property="testng1_output"> |
| 523 | + <filterchain> |
| 524 | + <tailfilter lines="4" skip="1"/> |
| 525 | + <tokenfilter> |
| 526 | + <replacestring from="[testng]" to=""/> |
| 527 | + <replacestring from="QuickLookTests" to="JaxwsFromWsdl Tests"/> |
| 528 | + </tokenfilter> |
| 529 | + </filterchain> |
| 530 | + </loadfile> |
| 531 | + <loadfile srcfile="wsit/jsr109tester/wsit2run.output" property="testng2_output"> |
| 532 | + <filterchain> |
| 533 | + <tailfilter lines="4" skip="1"/> |
| 534 | + <tokenfilter> |
| 535 | + <replacestring from="[testng]" to=""/> |
| 536 | + <replacestring from="QuickLookTests" to=" Jsr109tester Tests"/> |
| 537 | + </tokenfilter> |
| 538 | + </filterchain> |
521 | 539 | </loadfile> |
522 | 540 | <echo file="quicklook_summary.txt" append="true" message="${testng_output}"/> |
| 541 | + |
| 542 | + <echo file="quicklook_summary.txt" append="true" message="${testng1_output}"/> |
| 543 | + |
| 544 | + <echo file="quicklook_summary.txt" append="true" message="${testng2_output}"/> |
523 | 545 | <antcall target="build-version"/> |
524 | 546 | <available file="test-output/emailable-report.html" property="report.present"/> |
525 | 547 | <antcall target="quicklook-report"/> |
526 | 548 | <delete file="version.output"/> |
527 | 549 | </target> |
| 550 | + <target name="quicklook-summary_wd"> |
| 551 | + <tstamp> |
| 552 | + <format property="end.timestamp" pattern="EE MM/dd/yyyy HH:mm:ss zz" /> |
| 553 | + </tstamp> |
| 554 | + <echo file="quicklook_summary.txt" message=" Test completed: ${end.timestamp} ${line.separator}" /> |
| 555 | + <loadfile srcfile="runtestng.output" property="testng_output"> |
| 556 | + <filterchain> |
| 557 | + <tailfilter lines="4" skip="1"/> |
| 558 | + <tokenfilter> |
| 559 | + <replacestring from="[testng]" to=""/> |
| 560 | + </tokenfilter> |
| 561 | + </filterchain> |
| 562 | + </loadfile> |
| 563 | + <echo file="quicklook_summary.txt" append="true" message="${testng_output}"/> |
| 564 | + <antcall target="build-version"/> |
| 565 | + <available file="test-output/emailable-report.html" property="report.present"/> |
| 566 | + <antcall target="quicklook-report"/> |
| 567 | + <delete file="version.output"/> |
| 568 | + </target> |
528 | 569 |
|
529 | 570 | <target name="quicklook-report" if="report.present"> |
530 | 571 | <loadfile srcfile="version.output" property="build_version"> |
|
0 commit comments