From aa153f8e8469c8aaaf7e87dd36441608ec3f6ded Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 16 Jun 2026 02:08:01 -0400
Subject: [PATCH] Use the newer way to wire up tests.

---
 tests/guecs.cpp    |  2 +-
 tests/lel.cpp      |  2 +-
 tests/main.cpp     | 26 ++++++--------------------
 tests/shaders.cpp  |  2 +-
 tests/sound.cpp    |  2 +-
 tests/textures.cpp |  2 +-
 6 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/tests/guecs.cpp b/tests/guecs.cpp
index 82f558f..ecb6ce7 100644
--- a/tests/guecs.cpp
+++ b/tests/guecs.cpp
@@ -14,7 +14,7 @@ namespace guecs_tests {
   fuc2::Set TESTS{
     .name="GUECS tests (empty!)",
     .tests={
-      {"test_prototype", test_prototype},
+      TEST(test_prototype),
     }
   };
 }
diff --git a/tests/lel.cpp b/tests/lel.cpp
index 7928746..fd0b183 100644
--- a/tests/lel.cpp
+++ b/tests/lel.cpp
@@ -66,7 +66,7 @@ namespace lel_tests {
   fuc2::Set TESTS{
     .name="lel parser tests",
     .tests={
-      {"test_basic_ops", test_basic_ops},
+      TEST(test_basic_ops),
     }
   };
 }
diff --git a/tests/main.cpp b/tests/main.cpp
index 59b16c5..02811e1 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,26 +1,12 @@
 #include <fuc2/run.hpp>
 
-// you can also place these into a .hpp you include if
-// they're too numerous to manage
-namespace lel_tests {
-  extern fuc2::Set TESTS;
-}
+using namespace fuc2;
 
-namespace guecs_tests {
-  extern fuc2::Set TESTS;
-}
-
-namespace shader_tests {
-  extern fuc2::Set TESTS;
-}
-
-namespace sound_tests {
-  extern fuc2::Set TESTS;
-}
-
-namespace texture_tests {
-  extern fuc2::Set TESTS;
-}
+TEST_SET(lel_tests);
+TEST_SET(guecs_tests);
+TEST_SET(shader_tests);
+TEST_SET(sound_tests);
+TEST_SET(texture_tests);
 
 int main(int argc, char* argv[]) {
   run(lel_tests::TESTS);
diff --git a/tests/shaders.cpp b/tests/shaders.cpp
index 6e6cf6b..c151d7b 100644
--- a/tests/shaders.cpp
+++ b/tests/shaders.cpp
@@ -30,7 +30,7 @@ namespace shader_tests {
   fuc2::Set TESTS{
     .name="shader tests",
     .tests={
-      {"test_shader_loading", test_shader_loading},
+      TEST(test_shader_loading),
     }
   };
 }
diff --git a/tests/sound.cpp b/tests/sound.cpp
index 6f22929..9d02fa8 100644
--- a/tests/sound.cpp
+++ b/tests/sound.cpp
@@ -17,7 +17,7 @@ namespace sound_tests {
   fuc2::Set TESTS{
     .name="sound manager tests",
       .tests={
-        {"test_sound_manager", test_sound_manager},
+        TEST(test_sound_manager),
       }
   };
 }
diff --git a/tests/textures.cpp b/tests/textures.cpp
index 0d0dea2..f85883c 100644
--- a/tests/textures.cpp
+++ b/tests/textures.cpp
@@ -18,7 +18,7 @@ namespace texture_tests {
   fuc2::Set TESTS{
     .name="texture manager tests",
       .tests={
-        {"test_texture_management", test_texture_management},
+        TEST(test_texture_management),
       }
   };
 }