Modify tests to allow quantization matrices.

Change-Id: If740ec7e549d8bcd387f92c43fd8105c528e86ed

test/cpu_speed_test.cc

diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index 0620f56..c206285 100644
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -17,6 +17,9 @@
 namespace {
 
 const int kMaxPSNR = 100;
+#if CONFIG_AOM_QM
+const int kMaxPSNR_QM = 35;
+#endif
 
 class CpuSpeedTest
     : public ::libvpx_test::EncoderTest,
@@ -80,7 +83,11 @@
   init_flags_ = VPX_CODEC_USE_PSNR;
 
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+#if CONFIG_AOM_QM
+  EXPECT_GE(min_psnr_, kMaxPSNR_QM);
+#else
   EXPECT_GE(min_psnr_, kMaxPSNR);
+#endif
 }
 
 TEST_P(CpuSpeedTest, TestScreencastQ0) {
@@ -95,7 +102,11 @@
   init_flags_ = VPX_CODEC_USE_PSNR;
 
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+#if CONFIG_AOM_QM
+  EXPECT_GE(min_psnr_, kMaxPSNR_QM);
+#else
   EXPECT_GE(min_psnr_, kMaxPSNR);
+#endif
 }
 
 TEST_P(CpuSpeedTest, TestEncodeHighBitrate) {

test/end_to_end_test.cc

diff --git a/test/end_to_end_test.cc b/test/end_to_end_test.cc
index 96621db..b436e98 100644
--- a/test/end_to_end_test.cc
+++ b/test/end_to_end_test.cc
@@ -132,7 +132,11 @@
   }
 
   double GetPsnrThreshold() {
+#if CONFIG_AOM_QM
+    return kPsnrThreshold[cpu_used_][encoding_mode_] - 3.0;
+#else
     return kPsnrThreshold[cpu_used_][encoding_mode_];
+#endif
   }
 
   TestVideoParam test_video_param_;

test/quantize_test.cc

diff --git a/test/quantize_test.cc b/test/quantize_test.cc
index ddaa125..a38b8e6 100644
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -28,6 +28,7 @@
 using libvpx_test::ACMRandom;
 
 namespace {
+#if !CONFIG_AOM_QM
 #if CONFIG_VPX_HIGHBITDEPTH
 const int number_of_iterations = 100;
 
@@ -341,4 +342,5 @@
                                  &vpx_highbd_quantize_b_32x32_c, VPX_BITS_12)));
 #endif  // HAVE_SSE2
 #endif  // CONFIG_VPX_HIGHBITDEPTH
+#endif  // CONFIG_AOM_QM
 }  // namespace