Unbreak the tests build

7 files changed, 20 insertions, 25 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1b90a614..072a350f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,8 +1,6 @@
-/*
- * Copyright 2023 jacqueline <me@jacqueline.id.au>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
+# Copyright 2024 jacqueline <me@jacqueline.id.au>
+#
+# SPDX-License-Identifier: GPL-3.0-only
 
 cmake_minimum_required(VERSION 3.16)
 include($ENV{PROJ_PATH}/tools/cmake/common.cmake)
@@ -17,18 +15,18 @@ idf_build_set_property(
 #list(APPEND EXTRA_WARNINGS "-Werror")
 
 list(APPEND EXTRA_COMPONENT_DIRS
-  "$ENV{PROJ_PATH}/src/audio"
   "$ENV{PROJ_PATH}/src/codecs"
-  "$ENV{PROJ_PATH}/src/database"
   "$ENV{PROJ_PATH}/src/drivers"
+  "$ENV{PROJ_PATH}/src/graphics"
+  "$ENV{PROJ_PATH}/src/locale"
   "$ENV{PROJ_PATH}/src/memory"
+  "$ENV{PROJ_PATH}/src/tangara"
   "$ENV{PROJ_PATH}/src/tasks"
-  "$ENV{PROJ_PATH}/src/ui"
-  "$ENV{PROJ_PATH}/src/dev_console"
+  "$ENV{PROJ_PATH}/src/util"
   "fixtures"
   )
 
 # List all components that include tests here.
-set(TEST_COMPONENTS "codecs" "database" "drivers")
+set(TEST_COMPONENTS "drivers")
 
 project(device_tests)
diff --git a/test/fixtures/CMakeLists.txt b/test/fixtures/CMakeLists.txt
index 9895cf8d..44deefcd 100644
--- a/test/fixtures/CMakeLists.txt
+++ b/test/fixtures/CMakeLists.txt
@@ -1,7 +1,5 @@
-/*
- * Copyright 2023 jacqueline <me@jacqueline.id.au>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
+# Copyright 2023 jacqueline <me@jacqueline.id.au>
+#
+# SPDX-License-Identifier: GPL-3.0-only
 
 idf_component_register(INCLUDE_DIRS "." REQUIRES drivers)
diff --git a/test/fixtures/i2c_fixture.hpp b/test/fixtures/i2c_fixture.hpp
index e7e5d42d..dd33fe9e 100644
--- a/test/fixtures/i2c_fixture.hpp
+++ b/test/fixtures/i2c_fixture.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "catch2/catch.hpp"
-#include "i2c.hpp"
+#include "drivers/i2c.hpp"
 
 class I2CFixture {
  public:
diff --git a/test/fixtures/spi_fixture.hpp b/test/fixtures/spi_fixture.hpp
index a5e9cac3..d29977eb 100644
--- a/test/fixtures/spi_fixture.hpp
+++ b/test/fixtures/spi_fixture.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "catch2/catch.hpp"
-#include "spi.hpp"
+#include "drivers/spi.hpp"
 
 class SpiFixture {
  public:
diff --git a/test/main/CMakeLists.txt b/test/main/CMakeLists.txt
index d629441d..2cbd90fd 100644
--- a/test/main/CMakeLists.txt
+++ b/test/main/CMakeLists.txt
@@ -1,10 +1,8 @@
-/*
- * Copyright 2023 jacqueline <me@jacqueline.id.au>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
+# Copyright 2023 jacqueline <me@jacqueline.id.au>
+#
+# SPDX-License-Identifier: GPL-3.0-only
 
 idf_component_register(
   SRCS "main.cpp"
   INCLUDE_DIRS "."
-  REQUIRES "catch2 dev_console")
+  REQUIRES "catch2 tangara")
diff --git a/test/main/main.cpp b/test/main/main.cpp
index 2a935397..57be6b24 100644
--- a/test/main/main.cpp
+++ b/test/main/main.cpp
@@ -8,11 +8,11 @@
 
 #include <cstdint>
 
+#include "catch_runner.hpp"
 #include "esp_console.h"
 #include "esp_log.h"
 
-#include "catch_runner.hpp"
-#include "console.hpp"
+#include "dev_console/console.hpp"
 
 void RegisterCatch2() {
   esp_console_cmd_t cmd{
diff --git a/test/sdkconfig.test b/test/sdkconfig.test
index 42c5d0d0..c0fbf922 100644
--- a/test/sdkconfig.test
+++ b/test/sdkconfig.test
@@ -10,3 +10,4 @@ CONFIG_COMPILER_CXX_RTTI=y
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
 CONFIG_COMPILER_STACK_CHECK=y
 CONFIG_ESP_TASK_WDT=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="../partitions.csv"