skia2/tests/SkSLErrorTest.cpp

154 lines
5.7 KiB
C++
Raw Normal View History

Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
/*
* Copyright 2022 Google LLC
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
[includes] Enforce IWYU on sksl code PS1 regenerates the Bazel files. Use it as the base change when comparing patchsets. IWYU seems to do a good job of working with MyFile.cpp and MyFile.h, but if there is just a MyHeader.h, it doesn't always seem to throw errors if the includes aren't correct. This was observed with include/sksl/DSL.h This might be due to the fact that headers are not compiled on their own, so they are never sent directly to the IWYU binary. This change sets enforce_iwyu_on_package() on the all sksl packages and then fixes the includes until all those checks are happy. There were a few files that needed fixes outside of the sksl folder. Examples include: - src/gpu/effects/GrConvexPolyEffect.cpp - tests/SkSLDSLTest.cpp To really enforce this, we need to add a CI/CQ job that runs bazel build //example:hello_world_gl --config=clang \ --sandbox_base=/dev/shm --features skia_enforce_iwyu If that failed, a dev could make the changes described in the logs and/or run the command locally to see those prescribed fixes. I had to add several entries to toolchain/IWYU_mapping.imp in order to fix some private includes and other atypical choices. I tried adding a rule there to allow inclusion of SkTypes.h to make sure defines like SK_SUPPORT_GPU, but could not get it to work for all cases, so I deferred to using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h) Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06 Bug: skia:13052 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-03-18 20:40:58 +00:00
#include "include/core/SkData.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/private/SkSLProgramKind.h"
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
#include "src/core/SkOSFile.h"
#include "src/sksl/SkSLCompiler.h"
[includes] Enforce IWYU on sksl code PS1 regenerates the Bazel files. Use it as the base change when comparing patchsets. IWYU seems to do a good job of working with MyFile.cpp and MyFile.h, but if there is just a MyHeader.h, it doesn't always seem to throw errors if the includes aren't correct. This was observed with include/sksl/DSL.h This might be due to the fact that headers are not compiled on their own, so they are never sent directly to the IWYU binary. This change sets enforce_iwyu_on_package() on the all sksl packages and then fixes the includes until all those checks are happy. There were a few files that needed fixes outside of the sksl folder. Examples include: - src/gpu/effects/GrConvexPolyEffect.cpp - tests/SkSLDSLTest.cpp To really enforce this, we need to add a CI/CQ job that runs bazel build //example:hello_world_gl --config=clang \ --sandbox_base=/dev/shm --features skia_enforce_iwyu If that failed, a dev could make the changes described in the logs and/or run the command locally to see those prescribed fixes. I had to add several entries to toolchain/IWYU_mapping.imp in order to fix some private includes and other atypical choices. I tried adding a rule there to allow inclusion of SkTypes.h to make sure defines like SK_SUPPORT_GPU, but could not get it to work for all cases, so I deferred to using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h) Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06 Bug: skia:13052 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-03-18 20:40:58 +00:00
#include "src/sksl/SkSLUtil.h"
#include "src/sksl/ir/SkSLProgram.h"
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
#include "src/utils/SkOSPath.h"
#include "tests/Test.h"
#include "tools/Resources.h"
[includes] Enforce IWYU on sksl code PS1 regenerates the Bazel files. Use it as the base change when comparing patchsets. IWYU seems to do a good job of working with MyFile.cpp and MyFile.h, but if there is just a MyHeader.h, it doesn't always seem to throw errors if the includes aren't correct. This was observed with include/sksl/DSL.h This might be due to the fact that headers are not compiled on their own, so they are never sent directly to the IWYU binary. This change sets enforce_iwyu_on_package() on the all sksl packages and then fixes the includes until all those checks are happy. There were a few files that needed fixes outside of the sksl folder. Examples include: - src/gpu/effects/GrConvexPolyEffect.cpp - tests/SkSLDSLTest.cpp To really enforce this, we need to add a CI/CQ job that runs bazel build //example:hello_world_gl --config=clang \ --sandbox_base=/dev/shm --features skia_enforce_iwyu If that failed, a dev could make the changes described in the logs and/or run the command locally to see those prescribed fixes. I had to add several entries to toolchain/IWYU_mapping.imp in order to fix some private includes and other atypical choices. I tried adding a rule there to allow inclusion of SkTypes.h to make sure defines like SK_SUPPORT_GPU, but could not get it to work for all cases, so I deferred to using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h) Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06 Bug: skia:13052 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-03-18 20:40:58 +00:00
#include <functional>
#include <memory>
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
#include <sstream>
[includes] Enforce IWYU on sksl code PS1 regenerates the Bazel files. Use it as the base change when comparing patchsets. IWYU seems to do a good job of working with MyFile.cpp and MyFile.h, but if there is just a MyHeader.h, it doesn't always seem to throw errors if the includes aren't correct. This was observed with include/sksl/DSL.h This might be due to the fact that headers are not compiled on their own, so they are never sent directly to the IWYU binary. This change sets enforce_iwyu_on_package() on the all sksl packages and then fixes the includes until all those checks are happy. There were a few files that needed fixes outside of the sksl folder. Examples include: - src/gpu/effects/GrConvexPolyEffect.cpp - tests/SkSLDSLTest.cpp To really enforce this, we need to add a CI/CQ job that runs bazel build //example:hello_world_gl --config=clang \ --sandbox_base=/dev/shm --features skia_enforce_iwyu If that failed, a dev could make the changes described in the logs and/or run the command locally to see those prescribed fixes. I had to add several entries to toolchain/IWYU_mapping.imp in order to fix some private includes and other atypical choices. I tried adding a rule there to allow inclusion of SkTypes.h to make sure defines like SK_SUPPORT_GPU, but could not get it to work for all cases, so I deferred to using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h) Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06 Bug: skia:13052 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-03-18 20:40:58 +00:00
#include <string>
#include <utility>
#include <vector>
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
static std::vector<std::string> get_expected_errors(const char* shaderString) {
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
// Error expectations are embedded in the source with a special *%%* marker, like so:
//
// /*%%*
// expected 'foo', but found 'bar'
// 'baz' is not a valid identifier
// *%%*/
//
// Extract them from the shader text.
std::vector<std::string> expectedErrors;
constexpr char kExpectedErrorsStart[] = "/*%%*";
constexpr char kExpectedErrorsEnd[] = "*%%*/";
if (const char* startPtr = strstr(shaderString, kExpectedErrorsStart)) {
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
startPtr += strlen(kExpectedErrorsStart);
if (const char* endPtr = strstr(startPtr, kExpectedErrorsEnd)) {
// Store the text between these delimiters in an array of expected errors.
std::stringstream stream{std::string{startPtr, endPtr}};
while (stream.good()) {
expectedErrors.push_back({});
std::getline(stream, expectedErrors.back(), '\n');
if (expectedErrors.back().empty()) {
expectedErrors.pop_back();
}
}
}
}
return expectedErrors;
}
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
static void check_expected_errors(skiatest::Reporter* r,
const char* testFile,
const std::vector<std::string>& expectedErrors,
std::string reportedErrors) {
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
// Verify that the SkSL compiler actually emitted the expected error messages.
// The list of expectations isn't necessarily exhaustive, though.
std::string originalErrors = reportedErrors;
bool reportOriginalErrors = false;
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
for (const std::string& expectedError : expectedErrors) {
// If this error wasn't reported, trigger an error.
size_t pos = reportedErrors.find(expectedError.c_str());
if (pos == std::string::npos) {
ERRORF(r, "%s: Expected an error that wasn't reported:\n%s\n",
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
SkOSPath::Basename(testFile).c_str(), expectedError.c_str());
reportOriginalErrors = true;
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
} else {
// We found the error that we expected to have. Remove that error from our report, and
// everything preceding it as well. This ensures that we don't match the same error
// twice, and that errors are reported in the order we expect.
reportedErrors.erase(0, pos + expectedError.size());
}
}
if (reportOriginalErrors) {
ERRORF(r, "%s: The following errors were reported:\n%s\n",
SkOSPath::Basename(testFile).c_str(), originalErrors.c_str());
}
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
}
static void test_expect_fail(skiatest::Reporter* r, const char* testFile, SkSL::ProgramKind kind) {
sk_sp<SkData> shaderData = GetResourceAsData(testFile);
if (!shaderData) {
ERRORF(r, "%s: Unable to load file", SkOSPath::Basename(testFile).c_str());
return;
}
std::string shaderString{reinterpret_cast<const char*>(shaderData->bytes()),
shaderData->size()};
std::vector<std::string> expectedErrors = get_expected_errors(shaderString.c_str());
// Compile the code.
std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Standalone();
SkSL::Compiler compiler(caps.get());
SkSL::Program::Settings settings;
std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, std::move(shaderString),
settings);
// If the code actually generated a working program, we've already failed.
if (program) {
ERRORF(r, "%s: Expected failure, but compiled successfully",
SkOSPath::Basename(testFile).c_str());
return;
}
check_expected_errors(r, testFile, expectedErrors, compiler.errorText());
}
static void iterate_dir(const char* directory,
const char* extension,
const std::function<void(const char*)>& run) {
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
SkString resourceDirectory = GetResourcePath(directory);
SkOSFile::Iter iter(resourceDirectory.c_str(), extension);
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
SkString name;
while (iter.next(&name, /*getDir=*/false)) {
SkString path(SkOSPath::Join(directory, name.c_str()));
run(path.c_str());
}
}
DEF_TEST(SkSLErrorTest, r) {
iterate_dir("sksl/errors/", ".sksl", [&](const char* path) {
test_expect_fail(r, path, SkSL::ProgramKind::kFragment);
});
iterate_dir("sksl/errors/", ".rts", [&](const char* path) {
test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeShader);
});
}
DEF_TEST(SkSLRuntimeShaderErrorTest, r) {
iterate_dir("sksl/runtime_errors/", ".rts", [&](const char* path) {
test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeShader);
});
}
DEF_TEST(SkSLRuntimeColorFilterErrorTest, r) {
iterate_dir("sksl/runtime_errors/", ".rtcf", [&](const char* path) {
test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeColorFilter);
});
}
DEF_TEST(SkSLRuntimeBlenderErrorTest, r) {
iterate_dir("sksl/runtime_errors/", ".rtb", [&](const char* path) {
test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeBlender);
Reland "Verify that tests in errors/ actually generate the expected errors." This reverts commit 43539c22a2963f5db8f790c32aed8bf3a992ed68. Reason for revert: UB fixed at http://review.skia.org/505678 Original change's description: > Revert "Verify that tests in errors/ actually generate the expected errors." > > This reverts commit 8d646c127a7bed796eed927c8b9cff3a1ccedb06. > > Reason for revert: triggering UBSAN > http://screen/887FeQtZWs2A6oo > > Original change's description: > > Verify that tests in errors/ actually generate the expected errors. > > > > Error expectations are embedded in the source with a special *%%* > > marker, like this: > > > > /*%%* > > expected 'foo', but found 'bar' > > 'baz' is not a valid identifier > > *%%*/ > > > > This unit test compiles every effect in errors/ and verifies that it > > makes an error. It also verifies that the errors returned include the > > expectations from the *%%* marker section, in the listed order, if any > > expectations have been listed. (Error expectations are not meant to be > > exhaustive; additional errors are allowed.) > > > > In this CL, I've manually attached error expectations to the first few > > error tests. A followup CL will (mechanically) add expectations to every > > error test, based on their current error reports. > > > > Change-Id: I4add30fef6419c4d3f8d2a221c5aeb53eee35ae7 > > Bug: skia:12665 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505399 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Bug: skia:12665 > Change-Id: I3bcdbe9fc1abab13656d6462b73f6439967fd96f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505642 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12665 Change-Id: I49e23869f4ef383a0b076006e319e0a6d7191cad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505643 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-02-08 17:17:28 +00:00
});
}