Skip to content

Update DEPS: update googletest #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dneto0 merged 1 commit into from
Jul 16, 2019
Merged

Update DEPS: update googletest #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {
'cpplint_revision': '9f41862c0efa7681e2147910d39629c73a2b2702',
'dxc_revision': '7342a3b9be25bd4787fd24a4041795796e7ec49f',
'glslang_revision': 'c538b5d796fb24dd418fdd650c7f76e56bcc3dd8',
'googletest_revision': 'd5932506d6eed73ac80b9bcc47ed723c8c74eb1e',
'googletest_revision': '947aeab281f1b160d2db5045064be73c984f1ae6',
'lodepng_revision': 'ba9fc1f084f03b5fbf8c9a5df9448173f27544b1',
'shaderc_revision': '1f2dec1e12341170ebdc7723111ec17537cf8336',
'spirv_headers_revision': '29c11140baaf9f7fdaa39a583672c556bf1795a1',
Expand Down
4 changes: 2 additions & 2 deletions src/amberscript/parser_attach_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ END)";
ASSERT_FALSE(r.IsSuccess()) << r.Error();
EXPECT_EQ("9: only compute shaders allowed in a compute pipeline", r.Error());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserPipelineAttachTests,
AmberScriptParserPipelineAttachTest,
testing::Values(
Expand All @@ -137,7 +137,7 @@ INSTANTIATE_TEST_CASE_P(
kShaderTypeTessellationEvaluation},
ShaderTypeData{
"tessellation_control",
kShaderTypeTessellationControl}), ); // NOLINT(whitespace/parens)
kShaderTypeTessellationControl})); // NOLINT(whitespace/parens)

TEST_F(AmberScriptParserTest, PipelineEntryPoint) {
std::string in = R"(
Expand Down
6 changes: 3 additions & 3 deletions src/amberscript/parser_bind_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,13 +1089,13 @@ PIPELINE graphics my_pipeline
ASSERT_EQ(1U, bufs.size());
EXPECT_EQ(test_data.type, bufs[0].buffer->GetBufferType());
}
INSTANTIATE_TEST_CASE_P(
AmberScriptParserBufferTypeTest,
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserBufferTypeTestSamples,
AmberScriptParserBufferTypeTest,
testing::Values(BufferTypeData{"uniform", BufferType::kUniform},
BufferTypeData{
"storage",
BufferType::kStorage}), ); // NOLINT(whitespace/parens)
BufferType::kStorage})); // NOLINT(whitespace/parens)

TEST_F(AmberScriptParserTest, BindPushConstants) {
std::string in = R"(
Expand Down
14 changes: 7 additions & 7 deletions src/amberscript/parser_buffer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ TEST_P(AmberScriptParserBufferParseErrorTest, Test) {
EXPECT_EQ(std::string(test_data.err), r.Error()) << test_data.in;
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserBufferParseErrorTest,
AmberScriptParserBufferParseErrorTest,
testing::Values(
Expand Down Expand Up @@ -489,7 +489,7 @@ INSTANTIATE_TEST_CASE_P(
BufferParseError{"BUFFER my_buf DATA_TYPE int32 SIZE 5 FILL 5\nBUFFER "
"my_buf DATA_TYPE int16 SIZE 5 FILL 2",
// NOLINTNEXTLINE(whitespace/parens)
"2: duplicate buffer name provided"}), );
"2: duplicate buffer name provided"}));

struct BufferData {
const char* name;
Expand Down Expand Up @@ -523,7 +523,7 @@ TEST_P(AmberScriptParserBufferDataTypeTest, BufferTypes) {
EXPECT_EQ(test_data.type, fmt->GetComponents()[0].mode);
EXPECT_EQ(test_data.num_bits, fmt->GetComponents()[0].num_bits);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserTestsDataType,
AmberScriptParserBufferDataTypeTest,
testing::Values(BufferData{"int8", FormatMode::kSInt, 8, 1, 1},
Expand All @@ -543,7 +543,7 @@ INSTANTIATE_TEST_CASE_P(
BufferData{"mat3x3<float>", FormatMode::kSFloat, 32, 3, 3},
BufferData{"mat4x2<uint16>", FormatMode::kUInt, 16, 4, 2},
BufferData{"B8G8R8_UNORM", FormatMode::kUNorm, 8, 3,
1}), ); // NOLINT(whitespace/parens)
1})); // NOLINT(whitespace/parens)

struct NameData {
const char* name;
Expand All @@ -562,8 +562,8 @@ TEST_P(AmberScriptParserBufferDataTypeInvalidTest, BufferTypes) {
ASSERT_FALSE(r.IsSuccess()) << test_data.name;
EXPECT_EQ("1: invalid data_type provided", r.Error()) << test_data.name;
}
INSTANTIATE_TEST_CASE_P(
AmberScriptParserBufferDataTypeInvalidTest,
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserBufferDataTypeInvalidTestSamples,
AmberScriptParserBufferDataTypeInvalidTest,
testing::Values(NameData{"int17"},
NameData{"uintt0"},
Expand All @@ -587,7 +587,7 @@ INSTANTIATE_TEST_CASE_P(
NameData{"mat2x2<mat3x3<double>>"},
NameData{"mat2x2<unit7>"},
NameData{"mat2x2"},
NameData{"mat2x2<>"}), ); // NOLINT(whitespace/parens)
NameData{"mat2x2<>"})); // NOLINT(whitespace/parens)

} // namespace amberscript
} // namespace amber
4 changes: 2 additions & 2 deletions src/amberscript/parser_clear_color_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ CLEAR_COLOR my_pipeline )" +
EXPECT_EQ(std::string("13: ") + test_data.error, r.Error()) << test_data.data;
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserClearColorTests,
AmberScriptParserClearColorTest,
testing::Values(
Expand Down Expand Up @@ -165,7 +165,7 @@ INSTANTIATE_TEST_CASE_P(
"invalid A value for CLEAR_COLOR command: 5.2"},
ClearColorTestData{"255 255 255 256",
"invalid A value for CLEAR_COLOR "
"command: 256"}), ); // NOLINT(whitespace/parens)
"command: 256"})); // NOLINT(whitespace/parens)

} // namespace amberscript
} // namespace amber
21 changes: 10 additions & 11 deletions src/amberscript/parser_shader_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ TEST_P(AmberScriptParserShaderPassThroughTest, ShaderPassThroughWithoutVertex) {
"allowed",
r.Error());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserShaderPassThroughTests,
AmberScriptParserShaderPassThroughTest,
testing::Values(NameData{"fragment"},
NameData{"geometry"},
NameData{"tessellation_evaluation"},
NameData{"tessellation_control"},
NameData{"compute"},
NameData{"multi"}), ); // NOLINT(whitespace/parens)
NameData{"multi"})); // NOLINT(whitespace/parens)

TEST_F(AmberScriptParserTest, ShaderPassThroughUnknownShaderType) {
std::string in = "SHADER UNKNOWN my_shader PASSTHROUGH";
Expand Down Expand Up @@ -269,7 +269,7 @@ void main() {
EXPECT_EQ(kShaderFormatGlsl, shader->GetFormat());
EXPECT_EQ(shader_result, shader->GetData());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserTestsShaderType,
AmberScriptParserShaderTypeTest,
testing::Values(
Expand All @@ -281,7 +281,7 @@ INSTANTIATE_TEST_CASE_P(
ShaderTypeData{"tessellation_control", kShaderTypeTessellationControl},
ShaderTypeData{"compute", kShaderTypeCompute},
ShaderTypeData{"multi",
kShaderTypeMulti}), ); // NOLINT(whitespace/parens)
kShaderTypeMulti})); // NOLINT(whitespace/parens)

struct ShaderFormatData {
const char* name;
Expand Down Expand Up @@ -315,15 +315,14 @@ TEST_P(AmberScriptParserShaderFormatTest, ShaderFormats) {
EXPECT_EQ(test_data.format, shader->GetFormat());
EXPECT_EQ(shader_result, shader->GetData());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptParserTestsShaderFormat,
AmberScriptParserShaderFormatTest,
testing::Values(
ShaderFormatData{"GLSL", kShaderFormatGlsl},
ShaderFormatData{"SPIRV-ASM", kShaderFormatSpirvAsm},
ShaderFormatData{
"SPIRV-HEX",
kShaderFormatSpirvHex}), ); // NOLINT(whitespace/parens)
testing::Values(ShaderFormatData{"GLSL", kShaderFormatGlsl},
ShaderFormatData{"SPIRV-ASM", kShaderFormatSpirvAsm},
ShaderFormatData{
"SPIRV-HEX",
kShaderFormatSpirvHex})); // NOLINT(whitespace/parens)

TEST_F(AmberScriptParserTest, DuplicateShaderName) {
std::string in = R"(
Expand Down
9 changes: 4 additions & 5 deletions src/datum_type_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ TEST_P(DatumTypeTestFormat, ToFormat) {
auto fmt = dt.AsFormat();
EXPECT_EQ(test_data.format_type, fmt->GetFormatType());
}
INSTANTIATE_TEST_CASE_P(
DatumTypeTestFormat,
INSTANTIATE_TEST_SUITE_P(
DatumTypeTestFormatSamples,
DatumTypeTestFormat,
testing::Values(
Data{DataType::kInt8, 1, FormatType::kR8_SINT},
Expand Down Expand Up @@ -82,8 +82,7 @@ INSTANTIATE_TEST_CASE_P(
Data{DataType::kDouble, 1, FormatType::kR64_SFLOAT},
Data{DataType::kDouble, 2, FormatType::kR64G64_SFLOAT},
Data{DataType::kDouble, 3, FormatType::kR64G64B64_SFLOAT},
Data{
DataType::kDouble, 4,
FormatType::kR64G64B64A64_SFLOAT}), ); // NOLINT(whitespace/parens)
Data{DataType::kDouble, 4,
FormatType::kR64G64B64A64_SFLOAT})); // NOLINT(whitespace/parens)

} // namespace amber
6 changes: 3 additions & 3 deletions src/format_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ TEST_P(FormatStdTest, Test) {
<< test_data.name;
}

INSTANTIATE_TEST_CASE_P(
FormatStdTest,
INSTANTIATE_TEST_SUITE_P(
FormatStdTestSamples,
FormatStdTest,
testing::Values(
StdData{"mat2x2-std140", "R32G32_SFLOAT", 2, true, 8U, 16U, 32U},
Expand All @@ -147,6 +147,6 @@ INSTANTIATE_TEST_CASE_P(
64U},
StdData{"float-std140", "R32_SFLOAT", 1, true, 1U, 4U, 4U},
StdData{"float-std430", "R32_SFLOAT", 1, false, 1U, 4U,
4U}), ); // NOLINT(whitespace/parens)
4U})); // NOLINT(whitespace/parens)

} // namespace amber
4 changes: 2 additions & 2 deletions src/pipeline_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ TEST_P(AmberScriptPipelineComputePipelineTest,
ASSERT_FALSE(r.IsSuccess());
EXPECT_EQ("only compute shaders allowed in a compute pipeline", r.Error());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AmberScriptPipelineComputePipelineTests,
AmberScriptPipelineComputePipelineTest,
testing::Values(
Expand All @@ -115,7 +115,7 @@ INSTANTIATE_TEST_CASE_P(
ShaderTypeData{kShaderTypeGeometry},
ShaderTypeData{kShaderTypeTessellationEvaluation},
ShaderTypeData{
kShaderTypeTessellationControl}), ); // NOLINT(whitespace/parens)
kShaderTypeTessellationControl})); // NOLINT(whitespace/parens)

TEST_F(PipelineTest, SettingComputeShaderToGraphicsPipeline) {
Shader c(kShaderTypeCompute);
Expand Down
Loading