Minor adjustment in unit tests

The CpuSpeedTest is extended to cover 2pass good quality with CpuUsed
from 0 to 4. The BordersTest is changed to use CpuUsed 1 for faster
turn around.

Change-Id: I005e89adee7fe63af4b1f2a76a3a13ea826feadf

diff --git a/test/borders_test.cc b/test/borders_test.cc
index efaedb9d2c58744a3db69019a0c04fc7f5a271ce..dcdedcfab66e01136ece07498d6b9265c54e9b68 100644 (file)
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -30,7 +30,7 @@ class BordersTest : public ::libvpx_test::EncoderTest,
   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
                                   ::libvpx_test::Encoder *encoder) {
     if (video->frame() == 1) {
-      encoder->Control(VP8E_SET_CPUUSED, 0);
+      encoder->Control(VP8E_SET_CPUUSED, 1);
       encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
       encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
       encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);

diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index e6ad75b1d5e5b065cc1a01da0a5b7feb7461aff9..c92e723793d7a2e5ac9425676ee444b42a709dbc 100644 (file)
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -108,5 +108,5 @@ using std::tr1::make_tuple;
 VP9_INSTANTIATE_TEST_CASE(
     CpuSpeedTest,
     ::testing::Values(::libvpx_test::kTwoPassGood),
-    ::testing::Range(0, 3));
+    ::testing::Range(0, 5));
 }  // namespace