Commits

Maciej Fijalkowski committed da5f9d7 Merge

merge

  • Participants
  • Parent commits afe76c7, 077647c
  • Branches kill-someobject

Comments (0)

Files changed (1)

File pypy/translator/c/test/test_genc.py

             print '--------------'
             stderr, prevline, lastline, empty = stderr.rsplit('\n', 3)
             assert empty == ''
-            if lastline == 'Aborted':
-                lastline = prevline
-            assert lastline == ('Fatal RPython error: ' +
-                                expected_exception_name)
+            expected = 'Fatal RPython error: ' + expected_exception_name
+            assert lastline == expected or prevline == expected
             return None
 
         output(stdout)