Commits

Maciej Fijalkowski committed da5f9d7 Merge

merge

Comments (0)

Files changed (1)

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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.