From 73b45d0b71b529a0e0e6050f1d19bc9296f985bc Mon Sep 17 00:00:00 2001
From: Jade Turner <spacey-sooty@proton.me>
Date: Thu, 19 Dec 2024 21:58:04 +0800
Subject: [PATCH] use defaults

Signed-off-by: Jade Turner <spacey-sooty@proton.me>
---
 thirdparty/catch2/build.gradle | 2 +-
 upstream_utils/catch2.py       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/thirdparty/catch2/build.gradle b/thirdparty/catch2/build.gradle
index 15ec51e98e0..a04bee19c0e 100644
--- a/thirdparty/catch2/build.gradle
+++ b/thirdparty/catch2/build.gradle
@@ -28,7 +28,7 @@ task generateCatchUserConfig() {
         def read = catch2UserConfigInput.text
         read = read.replace('${CATCH_CONFIG_DEFAULT_REPORTER}', "console")
         read = read.replace('${CATCH_CONFIG_CONSOLE_WIDTH}', "80")
-        read = read.replaceAll("#cmakedefine", "#define")
+        read = read.replaceAll("#cmakedefine", "//")
 
         catch2UserConfigOutput.write(read)
     }
diff --git a/upstream_utils/catch2.py b/upstream_utils/catch2.py
index 897e24de807..adddbf8b84f 100755
--- a/upstream_utils/catch2.py
+++ b/upstream_utils/catch2.py
@@ -3,11 +3,7 @@
 import os
 import shutil
 
-from upstream_utils import (
-    comment_out_invalid_includes,
-    walk_cwd_and_copy_if,
-    Lib,
-)
+from upstream_utils import Lib, comment_out_invalid_includes, walk_cwd_and_copy_if
 
 
 def copy_upstream_src(wpilib_root):