shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "tests: clear system state after non-API calls"

--- /dev/null

+++ b/test/clear_system_state.h

@@ -1,0 +1,31 @@

+/*

+ *  Copyright (c) 2013 The WebM project authors. All Rights Reserved.

+ *

+ *  Use of this source code is governed by a BSD-style license

+ *  that can be found in the LICENSE file in the root of the source

+ *  tree. An additional intellectual property rights grant can be found

+ *  in the file PATENTS.  All contributing project authors may

+ *  be found in the AUTHORS file in the root of the source tree.

+ */

+#ifndef TEST_CLEAR_SYSTEM_STATE_H_

+#define TEST_CLEAR_SYSTEM_STATE_H_

+

+#include "vpx_config.h"

+extern "C" {

+#if ARCH_X86 || ARCH_X86_64

+# include "vpx_ports/x86.h"

+#endif

+}

+

+namespace libvpx_test {

+

+// Reset system to a known state. This function should be used for all non-API

+// test cases.

+inline void ClearSystemState() {

+#if ARCH_X86 || ARCH_X86_64

+  vpx_reset_mmx_state();

+#endif

+}

+

+}  // namespace libvpx_test

+#endif  // TEST_CLEAR_SYSTEM_STATE_H_

--- a/test/idct_test.cc

+++ b/test/idct_test.cc

@@ -13,6 +13,7 @@

 #include "./vpx_config.h"

 #include "./vp8_rtcd.h"

 }

+#include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

@@ -30,6 +31,10 @@

         /* Set up guard blocks */

         for (i = 0; i < 256; i++)

             output[i] = ((i & 0xF) < 4 && (i < 64)) ? 0 : -1;

+    }

+

+    virtual void TearDown() {

+      libvpx_test::ClearSystemState();

     }

     idct_fn_t UUT;

--- a/test/intrapred_test.cc

+++ b/test/intrapred_test.cc

@@ -11,6 +11,7 @@

 #include <string.h>

 #include "test/acm_random.h"

+#include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

 extern "C" {

@@ -25,6 +26,11 @@

 using libvpx_test::ACMRandom;

 class IntraPredBase {

+ public:

+  virtual void TearDown() {

+    libvpx_test::ClearSystemState();

+  }

+

  protected:

   void SetupMacroblock(uint8_t *data, int block_size, int stride,

                        int num_planes) {

--- a/test/pp_filter_test.cc

+++ b/test/pp_filter_test.cc

@@ -7,6 +7,7 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

 extern "C" {

@@ -27,7 +28,12 @@

 namespace {

 class Vp8PostProcessingFilterTest

-    : public ::testing::TestWithParam<post_proc_func_t> {};

+    : public ::testing::TestWithParam<post_proc_func_t> {

+ public:

+  virtual void TearDown() {

+    libvpx_test::ClearSystemState();

+  }

+};

 // Test routine for the VP8 post-processing function

 // vp8_post_proc_down_and_across_mb_row_c.

--- a/test/sad_test.cc

+++ b/test/sad_test.cc

@@ -26,6 +26,7 @@

 }

 #include "test/acm_random.h"

+#include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 #include "test/util.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

@@ -65,6 +66,10 @@

     source_data_ = NULL;

     vpx_free(reference_data_);

     reference_data_ = NULL;

+  }

+

+  virtual void TearDown() {

+    libvpx_test::ClearSystemState();

   }

  protected:

--- a/test/sixtap_predict_test.cc

+++ b/test/sixtap_predict_test.cc

@@ -12,6 +12,7 @@

 #include <stdlib.h>

 #include <string.h>

 #include "test/acm_random.h"

+#include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 #include "test/util.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

@@ -46,6 +47,10 @@

     dst_ = NULL;

     vpx_free(dst_c_);

     dst_c_ = NULL;

+  }

+

+  virtual void TearDown() {

+    libvpx_test::ClearSystemState();

   }

  protected:

--- a/test/subtract_test.cc

+++ b/test/subtract_test.cc

@@ -10,6 +10,7 @@

 #include "third_party/googletest/src/include/gtest/gtest.h"

 #include "test/acm_random.h"

+#include "test/clear_system_state.h"

 #include "test/register_state_check.h"

 extern "C" {

 #include "vpx_config.h"

@@ -23,7 +24,12 @@

 namespace {

-class SubtractBlockTest : public ::testing::TestWithParam<subtract_b_fn_t> {};

+class SubtractBlockTest : public ::testing::TestWithParam<subtract_b_fn_t> {

+ public:

+  virtual void TearDown() {

+    libvpx_test::ClearSystemState();

+  }

+};

 using libvpx_test::ACMRandom;

--- a/test/test.mk

+++ b/test/test.mk

@@ -1,3 +1,4 @@

+LIBVPX_TEST_SRCS-yes += clear_system_state.h

 LIBVPX_TEST_SRCS-yes += register_state_check.h

 LIBVPX_TEST_SRCS-yes += test.mk

 LIBVPX_TEST_SRCS-yes += acm_random.h

--- a/test/variance_test.cc

+++ b/test/variance_test.cc

@@ -12,6 +12,8 @@

 #include "third_party/googletest/src/include/gtest/gtest.h"

+#include "test/clear_system_state.h"

+

 #include "vpx/vpx_integer.h"

 #include "vpx_config.h"

 extern "C" {

@@ -51,6 +53,7 @@

   virtual void TearDown() {

     delete[] src_;

     delete[] ref_;

+    libvpx_test::ClearSystemState();

   }

  protected:

-- 

⑨