Skip to content

Fix: fix the 32 bit windows test as the analytics dll isn't 32 bit #1816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AustinBenoit merged 4 commits into from
Jan 12, 2026
Merged

Fix: fix the 32 bit windows test as the analytics dll isn't 32 bit #1816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1e5e52
Fix: fix the 32 bit windows test as the analytics dll isn't 32 bit
AustinBenoit Jan 9, 2026
a2aaddc
Update testing/test_framework/src/firebase_test_framework.h
AustinBenoit Jan 9, 2026
e073e23
Update testing/test_framework/src/firebase_test_framework.h
AustinBenoit Jan 9, 2026
a4a3bb1
fix formating and name of skip
AustinBenoit Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions analytics/integration_test/src/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ TEST_F(FirebaseAnalyticsTest, TestSetProperties) {
// The windows analytics DLL enables users to // set a callback function that is
// triggered when the underlying DLL logs something.
TEST_F(FirebaseAnalyticsTest, TestSetLogCallback) {
SKIP_TEST_ON_WINDOWS_X86;

std::promise<void> finishedPromise;
std::future<void> finished = finishedPromise.get_future();
bool log_callback_called = false;
Expand Down
14 changes: 14 additions & 0 deletions testing/test_framework/src/firebase_test_framework.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,28 @@ namespace firebase_test_framework {
#endif // (defined(TARGET_OS_OSX) && TARGET_OS_OSX)

#if defined(_WIN32)
// defined when the compilation target is 32-bit ARM, 64-bit ARM, x86, x64
#define SKIP_TEST_ON_WINDOWS \
{ \
app_framework::LogInfo("Skipping %s on Windows.", test_info_->name()); \
GTEST_SKIP(); \
return; \
}
#if !defined(_WIN64)
// _WIN64 when the target is 64-bit ARM, x64, or ARM64EC. Otherwise, undefined
// Using it then to tell when we are on windows but not a 64 bit target.
#define SKIP_TEST_ON_WINDOWS_X86 \
{ \
app_framework::LogInfo("Skipping %s on 32-bit Windows.", test_info_->name()); \
GTEST_SKIP(); \
return; \
}
#else
#define SKIP_TEST_ON_WINDOWS_X86 ((void)0)
#endif // !defined(_WIN64)
#else
#define SKIP_TEST_ON_WINDOWS ((void)0)
#define SKIP_TEST_ON_WINDOWS_X86 ((void)0)
#endif // defined(_WIN32)

#if defined(__linux__)
Expand Down
Loading