Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: source/libvpx/test/test_libvpx.cc

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/test/test.mk ('k') | source/libvpx/vp8/common/loopfilter.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/test/test_libvpx.cc
===================================================================
--- source/libvpx/test/test_libvpx.cc (revision 177019)
+++ source/libvpx/test/test_libvpx.cc (working copy)
@@ -9,9 +9,10 @@
*/
#include <string>
#include "vpx_config.h"
+extern "C" {
#if ARCH_X86 || ARCH_X86_64
-extern "C" {
#include "vpx_ports/x86.h"
+#endif
#if CONFIG_VP8
extern void vp8_rtcd();
#endif
@@ -19,7 +20,6 @@
extern void vp9_rtcd();
#endif
}
-#endif
#include "third_party/googletest/src/include/gtest/gtest.h"
static void append_gtest_filter(const char *str) {
@@ -47,12 +47,15 @@
append_gtest_filter(":-SSE4_1/*");
#endif
+#if !CONFIG_SHARED
+ /* Shared library builds don't support whitebox tests that exercise internal symbols. */
#if CONFIG_VP8
vp8_rtcd();
#endif
#if CONFIG_VP9
vp9_rtcd();
#endif
+#endif
return RUN_ALL_TESTS();
}
« no previous file with comments | « source/libvpx/test/test.mk ('k') | source/libvpx/vp8/common/loopfilter.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698