From 8b04772bb9651eeec6d270a322ad326513227acc Mon Sep 17 00:00:00 2001
From: Ricky Stewart <ricky@cockroachlabs.com>
Date: Thu, 10 Feb 2022 12:58:24 -0600
Subject: [PATCH] dev: disable `doctor` check for `merge-test-xmls`

Closes #76385.

Release note: None
---
 dev                | 2 +-
 pkg/cmd/dev/dev.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev b/dev
index be2a1e85253a..22d405c44d3b 100755
--- a/dev
+++ b/dev
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Bump this counter to force rebuilding `dev` on all machines.
-DEV_VERSION=14
+DEV_VERSION=15
 
 THIS_DIR=$(cd "$(dirname "$0")" && pwd)
 BINARY_DIR=$THIS_DIR/bin/dev-versions
diff --git a/pkg/cmd/dev/dev.go b/pkg/cmd/dev/dev.go
index e870bd9be0e1..c67771d92ed3 100644
--- a/pkg/cmd/dev/dev.go
+++ b/pkg/cmd/dev/dev.go
@@ -133,8 +133,8 @@ Typical usage:
 	var debugVar bool
 	ret.cli.PersistentFlags().BoolVar(&debugVar, "debug", false, "enable debug logging for dev")
 	ret.cli.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
-		isDoctor := cmd.Name() == "doctor"
-		if !isDoctor {
+		skipDoctorCheck := cmd.Name() == "doctor" || cmd.Name() == "merge-test-xmls"
+		if !skipDoctorCheck {
 			if err := ret.checkDoctorStatus(cmd.Context()); err != nil {
 				return err
 			}