Fix SSSE3 partial_idct_test detection
authorJohann <johannkoenig@google.com>
Wed, 5 Nov 2014 20:56:04 +0000 (12:56 -0800)
committerJohann <johannkoenig@google.com>
Wed, 5 Nov 2014 20:58:08 +0000 (12:58 -0800)
The test filter is not a prefix matcher. It requires test type to
contain no more than the optimization type. In this example, SSSE3_64
fails to match and the test is not skipped even when SSSE3 is not
available.

Change-Id: Ia74229a167c88da4e6da169012a7a77d438c3f75

test/partial_idct_test.cc

index 536273e..39d5854 100644 (file)
@@ -294,17 +294,6 @@ INSTANTIATE_TEST_CASE_P(
                    TX_4X4, 1)));
 #endif
 
-#if HAVE_SSSE3 && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH && \
-    !CONFIG_EMULATE_HARDWARE
-INSTANTIATE_TEST_CASE_P(
-    SSSE3_64, PartialIDctTest,
-    ::testing::Values(
-        make_tuple(&vp9_fdct8x8_c,
-                   &vp9_idct8x8_64_add_c,
-                   &vp9_idct8x8_12_add_ssse3,
-                   TX_8X8, 12)));
-#endif
-
 #if HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
 INSTANTIATE_TEST_CASE_P(
     SSSE3, PartialIDctTest,
@@ -312,6 +301,14 @@ INSTANTIATE_TEST_CASE_P(
         make_tuple(&vp9_fdct16x16_c,
                    &vp9_idct16x16_256_add_c,
                    &vp9_idct16x16_10_add_ssse3,
-                   TX_16X16, 10)));
-#endif
+                   TX_16X16, 10)
+#if ARCH_X86_64
+        ,
+        make_tuple(&vp9_fdct8x8_c,
+                   &vp9_idct8x8_64_add_c,
+                   &vp9_idct8x8_12_add_ssse3,
+                   TX_8X8, 12)
+#endif  // ARCH_X86_64
+        ));
+#endif  // HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
 }  // namespace