Add re-run number to testname format, and summary

[dnephin]

This should help make the re-runs easier to see.

• If the testname format is used, the re-runs will include a (re-run #) on the Pass/Fail line.
• The failure summary will include a (re-run #) on the Fail line
• The DONE line will include the number of runs when there is more than 1

Also makes an exit status that is not 0 or 1 an error that aborts re-runs.