encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove --skip-validation test flag from Dawn tests 

--enable-toggles=skip_validation is now the correct way to set
the toggle.

Bug: dawn:571
Change-Id: Ia05f542693fdd0eaadb0d87682a2f4b122e2ccb3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/32743
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2020-11-16 22:41:36 +00:00 committed by Commit Bot service account
parent 2c5b040b5c
commit 1805e46a15
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tests/DawnTest.cpp
View File

@ -226,11 +226,6 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) {
continue; continue;
} }
if (strcmp("--skip-validation", argv[i]) == 0) {
mEnabledToggles.push_back("skip_validation");
continue;
}
constexpr const char kEnableTogglesSwitch[] = "--enable-toggles="; constexpr const char kEnableTogglesSwitch[] = "--enable-toggles=";
argLen = sizeof(kEnableTogglesSwitch) - 1; argLen = sizeof(kEnableTogglesSwitch) - 1;
if (strncmp(argv[i], kEnableTogglesSwitch, argLen) == 0) { if (strncmp(argv[i], kEnableTogglesSwitch, argLen) == 0) {
@ -305,7 +300,7 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) {
if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) { if (strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
dawn::InfoLog() dawn::InfoLog()
<< "\n\nUsage: " << argv[0] << "\n\nUsage: " << argv[0]
<< " [GTEST_FLAGS...] [-w] [-d] [-c] [--skip-validation]\n" << " [GTEST_FLAGS...] [-w] [-d] [-c]\n"
" [--enable-toggles=toggles] [--disable-toggles=toggles]\n" " [--enable-toggles=toggles] [--disable-toggles=toggles]\n"
" [--adapter-vendor-id=x]" " [--adapter-vendor-id=x]"
" [--exclusive-device-type-preference=integrated,cpu,discrete]\n\n" " [--exclusive-device-type-preference=integrated,cpu,discrete]\n\n"
@ -314,9 +309,8 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) {
" to disabled)\n" " to disabled)\n"
" -c, --begin-capture-on-startup: Begin debug capture on startup " " -c, --begin-capture-on-startup: Begin debug capture on startup "
"(defaults to no capture)\n" "(defaults to no capture)\n"
" --skip-validation: Skip Dawn validation\n"
" --enable-toggles: Comma-delimited list of Dawn toggles to enable.\n" " --enable-toggles: Comma-delimited list of Dawn toggles to enable.\n"
" ex.) skip_validation,use_tint,disable_robustness,turn_off_vsync\n" " ex.) skip_validation,use_tint_generator,disable_robustness,turn_off_vsync\n"
" --disable-toggles: Comma-delimited list of Dawn toggles to disable\n" " --disable-toggles: Comma-delimited list of Dawn toggles to disable\n"
" --adapter-vendor-id: Select adapter by vendor id to run end2end tests" " --adapter-vendor-id: Select adapter by vendor id to run end2end tests"
"on multi-GPU systems \n" "on multi-GPU systems \n"