test(native): fix duplicate AdvertDataHelpers after upstream test
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
d9c7d2e9cd
commit
e1d4af3bbd
2 files changed
+10
-3
No files matched your search
+7
-3
@@ -208,7 +208,6 @@ build_src_filter =
|
||||
-<*>
|
||||
+<../src/Utils.cpp>
|
||||
+<../src/Packet.cpp>
|
||||
+<../src/helpers/AdvertDataHelpers.cpp>
|
||||
+<../src/helpers/ConfigSerializer.cpp>
|
||||
+<../src/helpers/DynamicConfigSerializer.cpp>
|
||||
+<../src/helpers/FairnessLimiter.cpp>
|
||||
@@ -239,7 +238,13 @@ build_flags = -std=c++17
|
||||
-g -O1
|
||||
build_unflags = -O2
|
||||
test_build_src = yes
|
||||
test_ignore = test_kiss_modem
|
||||
; test_empty_contact_slots (upstream 20. 10. 2026) jako prvni test vola ed25519
|
||||
; na hostu a UBSan zastavi na `lib/ed25519/fe.c:714: left shift of negative
|
||||
; value` -- idiom referencni implementace ref10, ne nalez v nasem kodu. GCC
|
||||
; nema per-file ignorelist, takze ten test bezi jen v [env:native].
|
||||
test_ignore =
|
||||
test_kiss_modem
|
||||
test_empty_contact_slots
|
||||
; POZOR: musi zustat v zakrytu s [env:native]. Merge upstreamu 2. 9. 2026 pridal
|
||||
; DynamicConfigSerializer.cpp jen tam a tenhle env pak padal na undefined
|
||||
; reference -- coz vypada jako nalez ASANu, a je to jen chybejici prekladova
|
||||
@@ -248,7 +253,6 @@ build_src_filter =
|
||||
-<*>
|
||||
+<../src/Utils.cpp>
|
||||
+<../src/Packet.cpp>
|
||||
+<../src/helpers/AdvertDataHelpers.cpp>
|
||||
+<../src/helpers/ConfigSerializer.cpp>
|
||||
+<../src/helpers/DynamicConfigSerializer.cpp>
|
||||
+<../src/helpers/FairnessLimiter.cpp>
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
#include <helpers/BatteryIcon.h>
|
||||
#include <helpers/AdvertDataHelpers.h>
|
||||
// Zdroják se vkládá jako v upstream testech (test_empty_contact_slots), ne přes
|
||||
// build_src_filter -- jinak by ho test, který si ho vloží sám, měl dvakrát.
|
||||
#include "helpers/AdvertDataHelpers.cpp"
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
|
||||
|
||||
Reference in new issue
Block a user