diff options
| author | James Zern <jzern@google.com> | 2014-06-25 10:44:36 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-25 10:44:36 -0700 |
| commit | d9c37b08f8c9489eddf96cbc9037b09f61f2b7f4 (patch) | |
| tree | a8c7a78fa74edbf605da1626a2dc3e66773dff6c /test | |
| parent | f8b0f52850a78e661f45c0de53276756de971b82 (diff) | |
| parent | 8f5b81fa8d815a9bdd486c28170b432bbb1ee50f (diff) | |
| download | libvpx-d9c37b08f8c9489eddf96cbc9037b09f61f2b7f4.tar libvpx-d9c37b08f8c9489eddf96cbc9037b09f61f2b7f4.tar.gz libvpx-d9c37b08f8c9489eddf96cbc9037b09f61f2b7f4.tar.bz2 libvpx-d9c37b08f8c9489eddf96cbc9037b09f61f2b7f4.zip | |
Merge "decode_test_driver: check HasFailure() in RunLoop"
Diffstat (limited to 'test')
| -rw-r--r-- | test/decode_test_driver.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/decode_test_driver.cc b/test/decode_test_driver.cc index cd1a79569..8bea4ccf9 100644 --- a/test/decode_test_driver.cc +++ b/test/decode_test_driver.cc @@ -47,7 +47,8 @@ void DecoderTest::RunLoop(CompressedVideoSource *video) { const bool is_vp8 = strncmp(kVP8Name, codec_name, sizeof(kVP8Name) - 1) == 0; // Decode frames. - for (video->Begin(); video->cxdata(); video->Next()) { + for (video->Begin(); !::testing::Test::HasFailure() && video->cxdata(); + video->Next()) { PreDecodeFrameHook(*video, decoder); vpx_codec_stream_info_t stream_info; |