use catch2 package (#684)

SConstruct

@@ -3,6 +3,7 @@ import platform
 import subprocess
 import sysconfig
 import numpy as np
+import catch2
 
 arch = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip()
 if platform.system() == "Darwin":
@@ -11,6 +12,7 @@ if platform.system() == "Darwin":
 common = ''
 
 cpppath = [
+  catch2.INCLUDE_DIR,
   f"#/",
   '#msgq/',
   '/usr/lib/include',

msgq/msgq_tests.cc

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include <catch2/catch.hpp>
 #include "msgq/msgq.h"
 
 static void cleanup_test_queue() {

msgq/test_runner.cc

@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch2/catch.hpp"
+#include <catch2/catch.hpp>

msgq/visionipc/test_runner.cc

@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch2/catch.hpp"
+#include <catch2/catch.hpp>

msgq/visionipc/visionipc_tests.cc

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include <catch2/catch.hpp>
 
 #include "msgq/visionipc/visionipc_server.h"
 #include "msgq/visionipc/visionipc_client.h"

pyproject.toml

@@ -15,6 +15,7 @@ dependencies = [
   "setuptools",  # for distutils
   "Cython",
   "scons",
+  "catch2 @ git+https://github.com/commaai/dependencies.git@release-catch2#subdirectory=catch2",
   "ruff",
   "parameterized",
   "coverage",

setup.sh

@@ -4,17 +4,6 @@ set -e
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 cd $DIR
 
-PLATFORM=$(uname -s)
-
-# catch2
-if [ ! -d $DIR/msgq/catch2/ ]; then
-  rm -rf /tmp/catch2/ $DIR/msgq/catch2/
-  git clone -b v2.x --depth 1 https://github.com/catchorg/Catch2.git /tmp/catch2
-  pushd /tmp/catch2
-  mv single_include/* $DIR/msgq/
-  popd
-fi
-
 if ! command -v uv &>/dev/null; then
   echo "'uv' is not installed. Installing 'uv'..."
   curl -LsSf https://astral.sh/uv/install.sh | sh