From 1805e46a1515b470ffb82238d1eec83f9cd71e80 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Mon, 16 Nov 2020 22:41:36 +0000 Subject: [PATCH] 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 Commit-Queue: Austin Eng --- src/tests/DawnTest.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/tests/DawnTest.cpp b/src/tests/DawnTest.cpp index 894797bc5d..7743875de9 100644 --- a/src/tests/DawnTest.cpp +++ b/src/tests/DawnTest.cpp @@ -226,11 +226,6 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) { continue; } - if (strcmp("--skip-validation", argv[i]) == 0) { - mEnabledToggles.push_back("skip_validation"); - continue; - } - constexpr const char kEnableTogglesSwitch[] = "--enable-toggles="; argLen = sizeof(kEnableTogglesSwitch) - 1; 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) { dawn::InfoLog() << "\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" " [--adapter-vendor-id=x]" " [--exclusive-device-type-preference=integrated,cpu,discrete]\n\n" @@ -314,9 +309,8 @@ void DawnTestEnvironment::ParseArgs(int argc, char** argv) { " to disabled)\n" " -c, --begin-capture-on-startup: Begin debug capture on startup " "(defaults to no capture)\n" - " --skip-validation: Skip Dawn validation\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" " --adapter-vendor-id: Select adapter by vendor id to run end2end tests" "on multi-GPU systems \n"