Skip to content

Commit e8298b3

Browse files
sarahjkimcopybara-github
sarahjkim
authored and
copybara-github
committed
Tell googletest about Abseil dependency in CMake
PiperOrigin-RevId: 599920056
1 parent a6db991 commit e8298b3

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

‎.github/workflows/cmake_test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
6060
-D CMAKE_BUILD_TYPE=RelWithDebug \
6161
-D FUZZTEST_REPO_BRANCH="${{ github.head_ref || github.ref_name }}" \
62+
-D GTEST_HAS_ABSL=1 \
6263
&& cmake --build build_codelab -j $(nproc)
6364
- name: Run all tests in default mode
6465
if: matrix.mode == 'default'
@@ -73,6 +74,7 @@ jobs:
7374
-D RE2_BUILD_TESTING=off \
7475
-D protobuf_BUILD_TESTS=off \
7576
-D FUZZTEST_BUILD_TESTING=on \
77+
-D GTEST_HAS_ABSL=1 \
7678
&& cmake --build build -j $(nproc) \
7779
&& ctest --test-dir build -j $(nproc) --output-on-failure
7880
- name: Run end-to-end tests in fuzzing mode
@@ -89,6 +91,7 @@ jobs:
8991
-D protobuf_BUILD_TESTS=off \
9092
-D FUZZTEST_FUZZING_MODE=on \
9193
-D FUZZTEST_BUILD_TESTING=on \
94+
-D GTEST_HAS_ABSL=1 \
9295
&& cmake --build build -j $(nproc) \
9396
&& ctest --test-dir build -j $(nproc) --output-on-failure -R "functional_test"
9497
- name: Save new cache based on main

‎domain_tests/arbitrary_domains_protobuf_test.cc

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ TEST(ProtocolBufferWithRequiredFields, OptionalFieldIsEventuallySet) {
169169
absl::BitGen bitgen;
170170
Value val(domain, bitgen);
171171

172-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
172+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
173173

174174
for (int i = 0; i < 1000; ++i) {
175175
val.Mutate(domain, bitgen, false);
176-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
176+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
177177
if (val.user_value.has_i32()) break;
178178
}
179179

@@ -187,14 +187,14 @@ TEST(ProtocolBufferWithRequiredFields, OptionalFieldIsEventuallyUnset) {
187187
absl::BitGen bitgen;
188188
Value val(domain, bitgen);
189189

190-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
190+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
191191

192192
// With the restricted domain, the probability of unsetting the field i32 is
193193
// at least 1/800. Hence, within 11000 iterations we'll fail to observe this
194194
// event with probability at most 10^(-6).
195195
for (int i = 0; i < 11000; ++i) {
196196
val.Mutate(domain, bitgen, false);
197-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
197+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
198198
if (!val.user_value.has_i32()) break;
199199
}
200200

@@ -208,11 +208,11 @@ TEST(ProtocolBufferWithRequiredFields, OptionalFieldInSubprotoIsEventuallySet) {
208208
absl::BitGen bitgen;
209209
Value val(domain, bitgen);
210210

211-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
211+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
212212

213213
for (int i = 0; i < 1000; ++i) {
214214
val.Mutate(domain, bitgen, false);
215-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
215+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
216216
if (val.user_value.has_req_sub() &&
217217
val.user_value.req_sub().has_subproto_i32())
218218
break;
@@ -230,14 +230,14 @@ TEST(ProtocolBufferWithRequiredFields,
230230
absl::BitGen bitgen;
231231
Value val(domain, bitgen);
232232

233-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
233+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
234234

235235
// With the restricted domain, the probability of unsetting the field
236236
// req_sub.subproto_i32 is at least 1/800. Hence, within 11000 iterations
237237
// we'll fail to observe this event with probability at most 10^(-6).
238238
for (int i = 0; i < 11000; ++i) {
239239
val.Mutate(domain, bitgen, false);
240-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
240+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
241241
if (val.user_value.has_req_sub() &&
242242
!val.user_value.req_sub().has_subproto_i32())
243243
break;
@@ -265,14 +265,13 @@ TEST(ProtocolBufferWithRequiredFields,
265265
absl::BitGen bitgen;
266266
Value val(domain, bitgen);
267267

268-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
268+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
269269

270270
for (int i = 0; i < 1000; ++i) {
271271
val.Mutate(domain, bitgen, false);
272-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
272+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
273273
if (val.user_value.has_sub_req()) {
274-
ASSERT_TRUE(val.user_value.sub_req().IsInitialized())
275-
<< val.user_value.DebugString();
274+
ASSERT_TRUE(val.user_value.sub_req().IsInitialized()) << val.user_value;
276275
break;
277276
}
278277
}
@@ -292,15 +291,15 @@ TEST(ProtocolBufferWithRequiredFields, MapFieldIsEventuallyPopulated) {
292291
absl::BitGen bitgen;
293292
Value val(domain, bitgen);
294293

295-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
294+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
296295

297296
bool found = false;
298297
for (int i = 0; i < 1000 && !found; ++i) {
299298
val.Mutate(domain, bitgen, false);
300-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
299+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
301300
for (const auto& pair : val.user_value.map_sub_req()) {
302301
found = true;
303-
ASSERT_TRUE(pair.second.IsInitialized()) << pair.second.DebugString();
302+
ASSERT_TRUE(pair.second.IsInitialized()) << pair.second;
304303
}
305304
}
306305

@@ -319,11 +318,11 @@ TEST(ProtocolBufferWithRequiredFields, ShrinkingNeverRemovesRequiredFields) {
319318
absl::BitGen bitgen;
320319
Value val(domain, bitgen);
321320

322-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
321+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
323322

324323
for (int i = 0; i < 1000; ++i) {
325324
val.Mutate(domain, bitgen, /*only_shrink=*/false);
326-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
325+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
327326
}
328327

329328
const auto is_minimal = [](const auto& v) {
@@ -334,7 +333,7 @@ TEST(ProtocolBufferWithRequiredFields, ShrinkingNeverRemovesRequiredFields) {
334333

335334
while (!is_minimal(val.user_value)) {
336335
val.Mutate(domain, bitgen, /*only_shrink=*/true);
337-
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value.DebugString();
336+
ASSERT_TRUE(val.user_value.IsInitialized()) << val.user_value;
338337
}
339338
}
340339

0 commit comments

Comments
 (0)