diff options
Diffstat (limited to 'scripts/patchtest')
| -rwxr-xr-x | scripts/patchtest | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/patchtest b/scripts/patchtest index a1c824f7b7..8c9a73e1db 100755 --- a/scripts/patchtest +++ b/scripts/patchtest | |||
| @@ -142,6 +142,8 @@ def _runner(resultklass, prefix=None): | |||
| 142 | logger.error(traceback.print_exc()) | 142 | logger.error(traceback.print_exc()) |
| 143 | logger.error('patchtest: something went wrong') | 143 | logger.error('patchtest: something went wrong') |
| 144 | return 1 | 144 | return 1 |
| 145 | if result.test_failure or result.test_error: | ||
| 146 | return 1 | ||
| 145 | 147 | ||
| 146 | return 0 | 148 | return 0 |
| 147 | 149 | ||
| @@ -158,9 +160,14 @@ def run(patch, logfile=None): | |||
| 158 | postmerge_resultklass = getResult(patch, True, logfile) | 160 | postmerge_resultklass = getResult(patch, True, logfile) |
| 159 | postmerge_result = _runner(postmerge_resultklass, 'test') | 161 | postmerge_result = _runner(postmerge_resultklass, 'test') |
| 160 | 162 | ||
| 163 | print('----------------------------------------------------------------------\n') | ||
| 161 | if premerge_result == 2 and postmerge_result == 2: | 164 | if premerge_result == 2 and postmerge_result == 2: |
| 162 | logger.error('patchtest: any test cases found - did you specify the correct suite directory?') | 165 | logger.error('patchtest: Not any test cases found - did you specify the correct suite directory?') |
| 163 | 166 | if premerge_result == 1 or postmerge_result == 1: | |
| 167 | logger.error('patchtest: At least one patchtest caused a failure or an error - please check') | ||
| 168 | else: | ||
| 169 | logger.error('patchtest: All patchtests passed') | ||
| 170 | print('----------------------------------------------------------------------\n') | ||
| 164 | return premerge_result or postmerge_result | 171 | return premerge_result or postmerge_result |
| 165 | 172 | ||
| 166 | def main(): | 173 | def main(): |
