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

Side by Side Diff: gpu/config/gpu_test_expectations_parser_unittest.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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 unified diff | Download patch
« no previous file with comments | « gpu/config/gpu_test_expectations_parser.cc ('k') | gpu/gles2_conform_support/egl/config.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h>
6
5 #include "base/format_macros.h" 7 #include "base/format_macros.h"
6 #include "base/logging.h" 8 #include "base/logging.h"
7 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
8 #include "gpu/config/gpu_test_expectations_parser.h" 10 #include "gpu/config/gpu_test_expectations_parser.h"
9 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
10 12
11 namespace gpu { 13 namespace gpu {
12 14
13 struct TestOSEntry { 15 struct TestOSEntry {
14 const char* name; 16 const char* name;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 bot_config_.set_os(GPUTestConfig::kOsWin7); 73 bot_config_.set_os(GPUTestConfig::kOsWin7);
72 bot_config_.set_build_type(GPUTestConfig::kBuildTypeRelease); 74 bot_config_.set_build_type(GPUTestConfig::kBuildTypeRelease);
73 bot_config_.AddGPUVendor(0x10de); 75 bot_config_.AddGPUVendor(0x10de);
74 bot_config_.set_gpu_device_id(0x0640); 76 bot_config_.set_gpu_device_id(0x0640);
75 bot_config_.set_api(GPUTestConfig::kAPID3D11); 77 bot_config_.set_api(GPUTestConfig::kAPID3D11);
76 ASSERT_TRUE(bot_config_.IsValid()); 78 ASSERT_TRUE(bot_config_.IsValid());
77 } 79 }
78 80
79 void TearDown() override {} 81 void TearDown() override {}
80 82
81 void set_os(int32 os) { 83 void set_os(int32_t os) {
82 bot_config_.set_os(os); 84 bot_config_.set_os(os);
83 ASSERT_TRUE(bot_config_.IsValid()); 85 ASSERT_TRUE(bot_config_.IsValid());
84 } 86 }
85 87
86 private: 88 private:
87 GPUTestBotConfig bot_config_; 89 GPUTestBotConfig bot_config_;
88 }; 90 };
89 91
90 class GPUTestExpectationsParserParamTest 92 class GPUTestExpectationsParserParamTest
91 : public GPUTestExpectationsParserTest, 93 : public GPUTestExpectationsParserTest,
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 EXPECT_FALSE(parser.LoadTestExpectations(text)); 343 EXPECT_FALSE(parser.LoadTestExpectations(text));
342 EXPECT_NE(0u, parser.GetErrorMessages().size()); 344 EXPECT_NE(0u, parser.GetErrorMessages().size());
343 } 345 }
344 346
345 INSTANTIATE_TEST_CASE_P(GPUTestExpectationsParser, 347 INSTANTIATE_TEST_CASE_P(GPUTestExpectationsParser,
346 GPUTestExpectationsParserParamTest, 348 GPUTestExpectationsParserParamTest,
347 ::testing::ValuesIn(kOSVersionsWithFamily)); 349 ::testing::ValuesIn(kOSVersionsWithFamily));
348 350
349 } // namespace gpu 351 } // namespace gpu
350 352
OLDNEW
« no previous file with comments | « gpu/config/gpu_test_expectations_parser.cc ('k') | gpu/gles2_conform_support/egl/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698