diff options
| author | James Zern <jzern@google.com> | 2020-06-19 02:52:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-19 02:52:58 +0000 |
| commit | 7ec916e8183332df6f1bd94b58f344f9923833b7 (patch) | |
| tree | 391c9396a7debb7833d8bfa8851e52f760696eba /test/codec_factory.h | |
| parent | 769129fb29fc66720be2b01276a472c334757d2d (diff) | |
| parent | 83769e3d250b05df0bb97fc619f5886587b2a310 (diff) | |
| download | libvpx-7ec916e8183332df6f1bd94b58f344f9923833b7.tar libvpx-7ec916e8183332df6f1bd94b58f344f9923833b7.tar.gz libvpx-7ec916e8183332df6f1bd94b58f344f9923833b7.tar.bz2 libvpx-7ec916e8183332df6f1bd94b58f344f9923833b7.zip | |
Merge changes I07f2c208,I79762df8
* changes:
update googletest to v1.10.0
vp9_skip_loopfilter_test: make Init() return a bool
Diffstat (limited to 'test/codec_factory.h')
| -rw-r--r-- | test/codec_factory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/codec_factory.h b/test/codec_factory.h index 17c9512ca..77ce49de9 100644 --- a/test/codec_factory.h +++ b/test/codec_factory.h @@ -157,15 +157,15 @@ class VP8CodecFactory : public CodecFactory { const libvpx_test::VP8CodecFactory kVP8; -#define VP8_INSTANTIATE_TEST_CASE(test, ...) \ - INSTANTIATE_TEST_CASE_P( \ +#define VP8_INSTANTIATE_TEST_SUITE(test, ...) \ + INSTANTIATE_TEST_SUITE_P( \ VP8, test, \ ::testing::Combine( \ ::testing::Values(static_cast<const libvpx_test::CodecFactory *>( \ &libvpx_test::kVP8)), \ __VA_ARGS__)) #else -#define VP8_INSTANTIATE_TEST_CASE(test, ...) +#define VP8_INSTANTIATE_TEST_SUITE(test, ...) #endif // CONFIG_VP8 /* @@ -253,15 +253,15 @@ class VP9CodecFactory : public CodecFactory { const libvpx_test::VP9CodecFactory kVP9; -#define VP9_INSTANTIATE_TEST_CASE(test, ...) \ - INSTANTIATE_TEST_CASE_P( \ +#define VP9_INSTANTIATE_TEST_SUITE(test, ...) \ + INSTANTIATE_TEST_SUITE_P( \ VP9, test, \ ::testing::Combine( \ ::testing::Values(static_cast<const libvpx_test::CodecFactory *>( \ &libvpx_test::kVP9)), \ __VA_ARGS__)) #else -#define VP9_INSTANTIATE_TEST_CASE(test, ...) +#define VP9_INSTANTIATE_TEST_SUITE(test, ...) #endif // CONFIG_VP9 } // namespace libvpx_test |