diff options
| author | James Zern <jzern@google.com> | 2014-01-13 11:25:59 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-13 11:25:59 -0800 |
| commit | ff0d073d88988f349ca44887423b759d330496a6 (patch) | |
| tree | 5dc237ab02e788721fd84684094dcb810cfd7466 | |
| parent | 4ae8ac7be8a7da7490c17ea38d793ced2566dde6 (diff) | |
| parent | ada9dd7d84eca2a02f459ae6ee199d2eb3264497 (diff) | |
| download | libvpx-ff0d073d88988f349ca44887423b759d330496a6.tar libvpx-ff0d073d88988f349ca44887423b759d330496a6.tar.gz libvpx-ff0d073d88988f349ca44887423b759d330496a6.tar.bz2 libvpx-ff0d073d88988f349ca44887423b759d330496a6.zip | |
Merge "test_libvpx: fix negative CPU filter"
| -rw-r--r-- | test/test_libvpx.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/test/test_libvpx.cc b/test/test_libvpx.cc index 80aca98b3..bbcbcf9bc 100644 --- a/test/test_libvpx.cc +++ b/test/test_libvpx.cc @@ -22,8 +22,10 @@ extern void vp9_rtcd(); } #include "third_party/googletest/src/include/gtest/gtest.h" -static void append_gtest_filter(const char *str) { +static void append_negative_gtest_filter(const char *str) { std::string filter = ::testing::FLAGS_gtest_filter; + // Negative patterns begin with one '-' followed by a ':' separated list. + if (filter.find('-') == std::string::npos) filter += '-'; filter += str; ::testing::FLAGS_gtest_filter = filter; } @@ -34,21 +36,21 @@ int main(int argc, char **argv) { #if ARCH_X86 || ARCH_X86_64 const int simd_caps = x86_simd_caps(); if (!(simd_caps & HAS_MMX)) - append_gtest_filter(":-MMX/*"); + append_negative_gtest_filter(":MMX/*"); if (!(simd_caps & HAS_SSE)) - append_gtest_filter(":-SSE/*"); + append_negative_gtest_filter(":SSE/*"); if (!(simd_caps & HAS_SSE2)) - append_gtest_filter(":-SSE2/*"); + append_negative_gtest_filter(":SSE2/*"); if (!(simd_caps & HAS_SSE3)) - append_gtest_filter(":-SSE3/*"); + append_negative_gtest_filter(":SSE3/*"); if (!(simd_caps & HAS_SSSE3)) - append_gtest_filter(":-SSSE3/*"); + append_negative_gtest_filter(":SSSE3/*"); if (!(simd_caps & HAS_SSE4_1)) - append_gtest_filter(":-SSE4_1/*"); + append_negative_gtest_filter(":SSE4_1/*"); if (!(simd_caps & HAS_AVX)) - append_gtest_filter(":-AVX/*"); + append_negative_gtest_filter(":AVX/*"); if (!(simd_caps & HAS_AVX2)) - append_gtest_filter(":-AVX2/*"); + append_negative_gtest_filter(":AVX2/*"); #endif #if !CONFIG_SHARED |