diff options
| author | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 16:54:12 +0000 |
|---|---|---|
| committer | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 16:54:12 +0000 |
| commit | f798d31a0836b3fdabbce90bd186f033f05a5927 (patch) | |
| tree | 6f3cef5e6ae65ae1eea8f622ac6dc2c1279bd967 /gpu/angle_unittest_main.cc | |
| parent | 1ef02d2440c2ce1cad30ce2f2d10f7856d773de4 (diff) | |
| download | chromium_src-f798d31a0836b3fdabbce90bd186f033f05a5927.zip chromium_src-f798d31a0836b3fdabbce90bd186f033f05a5927.tar.gz chromium_src-f798d31a0836b3fdabbce90bd186f033f05a5927.tar.bz2 | |
Revert 227161 "Include angle tests in gpu_unittests"
Failing to build on win trybots even after clobbering.
> Include angle tests in gpu_unittests
>
> BUG=
> TEST=gpu_unittests
> R=kbr@chromium.org, piman@chromium.org
>
> Review URL: https://codereview.chromium.org/23509013
TBR=zmo@chromium.org
Review URL: https://codereview.chromium.org/26257004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/angle_unittest_main.cc')
| -rw-r--r-- | gpu/angle_unittest_main.cc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gpu/angle_unittest_main.cc b/gpu/angle_unittest_main.cc deleted file mode 100644 index 8ca5271..0000000 --- a/gpu/angle_unittest_main.cc +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/at_exit.h" -#include "base/command_line.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h" - -int main(int argc, char** argv) { - // On Android, AtExitManager is created in - // testing/android/native_test_wrapper.cc before main() is called. - // The same thing is also done in base/test/test_suite.cc -#if !defined(OS_ANDROID) - base::AtExitManager exit_manager; -#endif - CommandLine::Init(argc, argv); - testing::InitGoogleMock(&argc, argv); - ShInitialize(); - int rt = RUN_ALL_TESTS(); - ShFinalize(); - return rt; -} |