use defaults

Signed-off-by: Jade Turner <[email protected]>
wpilibsuite · Dec 19, 2024 · 73b45d0 · 73b45d0
1 parent 11ebe36
commit 73b45d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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):