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

Unified Diff: gpu/angle_unittest_main.cc

Issue 23509013: Include angle tests in gpu_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 3 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 | « no previous file | gpu/command_buffer_service.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/angle_unittest_main.cc
diff --git a/gpu/command_buffer/common/unittest_main.cc b/gpu/angle_unittest_main.cc
similarity index 82%
copy from gpu/command_buffer/common/unittest_main.cc
copy to gpu/angle_unittest_main.cc
index 08c4b3480387f8be2fee64b999e97397dbe240ad..2e8991c08b64ce804f4a83bb0ae6265bc225ab6c 100644
--- a/gpu/command_buffer/common/unittest_main.cc
+++ b/gpu/angle_unittest_main.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gl/gl_implementation.h"
+#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
int main(int argc, char** argv) {
// On Android, AtExitManager is created in
@@ -16,7 +16,9 @@ int main(int argc, char** argv) {
base::AtExitManager exit_manager;
#endif
CommandLine::Init(argc, argv);
- gfx::InitializeGLBindings(gfx::kGLImplementationMockGL);
testing::InitGoogleMock(&argc, argv);
- return RUN_ALL_TESTS();
+ ShInitialize();
+ int rt = RUN_ALL_TESTS();
+ ShFinalize();
+ return rt;
}
« no previous file with comments | « no previous file | gpu/command_buffer_service.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698