xenios/XeniOS
0
0
Fork 0
mirror of https://github.com/xenios-jp/XeniOS.git synced 2026-07-11 15:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

[CPU/tests] Drop duplicate apu/gpu cvars from test mains

Browse Source 
ppc_testing_main.cc and test_suite_main.cc each defined the apu/gpu backend-selection cvars, which are also defined in cpu/testing/test_backend_cvars.cc (compiled into both test targets). With XENIA_BUILD_TESTS=ON this produced "ld: duplicate symbol cvars::apu / cvars::gpu" and neither xenia-cpu-tests nor xenia-cpu-ppc-tests would link.

Remove the redundant definitions from the two mains; test_backend_cvars.cc remains the single definition site.
This commit is contained in:
XeniOS
2026-06-08 01:54:30 +09:00
parent 7e483f4405
commit 339d21e56d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xenia/cpu/ppc/testing/ppc_testing_main.cc
+3 -4
View File
@@ -39,10 +39,9 @@ DEFINE_bool(mount_cache, false, "Enable cache mount", "Storage");
DEFINE_bool(mount_memory_unit, false, "Enable memory unit (MU) mount",
"Storage");
// xenia-core's Emulator::SetupSubsystems pulls in these cvars; provide stubs
// so the test runner links without depending on xenia_main.cc.
DEFINE_string(apu, "nop", "Audio system stub for tests.", "APU");
DEFINE_string(gpu, "null", "Graphics system stub for tests.", "GPU");
// The apu/gpu backend-selection cvars that Emulator::SetupSubsystems pulls in
// are defined once in cpu/testing/test_backend_cvars.cc (linked into this
// target) so the test mains don't collide on duplicate definitions.
DEFINE_path(test_path, "src/xenia/cpu/ppc/testing/",
"Directory scanned for test files.", "Other");
tools/build/src/test_suite_main.cc
+3 -4
View File
@@ -23,10 +23,9 @@ DEFINE_bool(mount_cache, false, "Enable cache mount", "Storage");
DEFINE_bool(mount_memory_unit, false, "Enable memory unit (MU) mount",
"Storage");
// xenia-core's Emulator::SetupSubsystems references these cvars; provide
// stubs so test suites that pull in xenia-core link without xenia_main.cc.
DEFINE_string(apu, "nop", "Audio system stub for tests.", "APU");
DEFINE_string(gpu, "null", "Graphics system stub for tests.", "GPU");
// The apu/gpu backend-selection cvars that Emulator::SetupSubsystems pulls in
// are defined once in cpu/testing/test_backend_cvars.cc (linked into this
// target) so the test suites don't collide on duplicate definitions.
#define CATCH_CONFIG_RUNNER
#include "third_party/catch/single_include/catch2/catch.hpp"