Skip to content

Commit 7781e0b

Browse files
Copilot0xrinegade
andcommitted
Fix C++ SDK integration tests and Windows MSVC pragma compatibility
Co-authored-by: 0xrinegade <[email protected]>
1 parent 9b465e6 commit 7781e0b

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

cpp_sdk/src/stubs.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
* implementation, these would interface with the actual C SDK.
88
*/
99

10+
#if defined(__GNUC__) || defined(__clang__)
1011
#pragma GCC diagnostic push
1112
#pragma GCC diagnostic ignored "-Wunused-parameter"
1213
#if defined(__GNUC__) && !defined(__clang__)
1314
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
1415
#endif
16+
#endif
1517

1618
#include <sodium.h>
1719

@@ -1438,4 +1440,6 @@ IdlDefinition Idl::load_svmai_token_idl() {
14381440

14391441
} // namespace SolanaAiRegistries
14401442

1443+
#if defined(__GNUC__) || defined(__clang__)
14411444
#pragma GCC diagnostic pop
1445+
#endif

cpp_sdk/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ gtest_discover_tests(aireg++_tests)
4242

4343
# Create integration test target
4444
add_test(NAME integration_tests
45-
COMMAND aireg++_tests --gtest_filter="*Integration*"
45+
COMMAND $<TARGET_FILE:aireg++_tests> --gtest_filter=*Integration*
4646
)
4747

4848
set_tests_properties(integration_tests PROPERTIES

cpp_sdk/tests/test_common.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,14 @@ TEST_F(CommonTest, ResourceRaii) {
108108
resource_deleted = false;
109109

110110
{
111+
#if defined(__GNUC__) || defined(__clang__)
111112
#pragma GCC diagnostic push
112113
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
114+
#endif
113115
Resource<int> resource(new int(42), test_deleter);
116+
#if defined(__GNUC__) || defined(__clang__)
114117
#pragma GCC diagnostic pop
118+
#endif
115119
EXPECT_TRUE(resource.is_valid());
116120
EXPECT_EQ(*resource.get(), 42);
117121
EXPECT_FALSE(resource_deleted);
@@ -124,11 +128,15 @@ TEST_F(CommonTest, ResourceRaii) {
124128
TEST_F(CommonTest, ResourceMove) {
125129
resource_deleted = false;
126130

131+
#if defined(__GNUC__) || defined(__clang__)
127132
#pragma GCC diagnostic push
128133
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
134+
#endif
129135
Resource<int> resource1(new int(42), test_deleter);
130136
Resource<int> resource2 = std::move(resource1);
137+
#if defined(__GNUC__) || defined(__clang__)
131138
#pragma GCC diagnostic pop
139+
#endif
132140

133141
EXPECT_FALSE(resource1.is_valid());
134142
EXPECT_TRUE(resource2.is_valid());
@@ -139,10 +147,14 @@ TEST_F(CommonTest, ResourceMove) {
139147
TEST_F(CommonTest, ResourceRelease) {
140148
resource_deleted = false;
141149

150+
#if defined(__GNUC__) || defined(__clang__)
142151
#pragma GCC diagnostic push
143152
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
153+
#endif
144154
Resource<int> resource(new int(42), test_deleter);
155+
#if defined(__GNUC__) || defined(__clang__)
145156
#pragma GCC diagnostic pop
157+
#endif
146158
int *released_ptr = resource.release();
147159

148160
EXPECT_FALSE(resource.is_valid());

0 commit comments

Comments
 (0)