Skip to content

Commit 3fe2960

Browse files
c8efc8ef
authored
fix bazel build (#452)
1 parent 36fbcb5 commit 3fe2960

15 files changed

Lines changed: 83 additions & 69 deletions

File tree

‎BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_library")
12
load("//bazel/config:copt.bzl", "ASYNC_SIMPLE_COPTS")
23

34
uthread_prefix = "async_simple/uthread/internal/"

‎MODULE.bazel‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
module(name = "com_github_async_simple")
2-
bazel_dep(name = "platforms", version = "0.0.10")
3-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
4-
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest", dev_dependency = True)
5-
bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_benchmark", dev_dependency = True)
2+
3+
bazel_dep(name = "platforms", version = "1.0.0")
4+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
5+
6+
bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True, repo_name = "com_google_googletest")
7+
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True, repo_name = "com_google_benchmark")
68
bazel_dep(name = "boringssl", version = "0.20250311.0", dev_dependency = True)
79

10+
bazel_dep(name = "rules_cc", version = "0.2.16")
11+
812
# Hedron's Compile Commands Extractor for Bazel
913
# https://github.com/hedronvision/bazel-compile-commands-extractor
1014
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
1115
git_override(
1216
module_name = "hedron_compile_commands",
13-
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
1417
commit = "1e08f8e0507b6b6b1f4416a9a22cf5c28beaba93",
18+
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
1519
)

‎async_simple/coro/test/BUILD.bazel‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
12
load("//bazel/config:copt.bzl", "ASYNC_SIMPLE_COPTS")
23

34
cc_library(
@@ -9,14 +10,14 @@ cc_library(
910
cc_test(
1011
name = "async_simple_coro_test",
1112
srcs = glob(["*.cpp"]),
12-
deps = [
13-
"//:async_simple",
14-
"//async_simple/test:gtest_main",
15-
":hdrs_dep",
16-
],
1713
copts = ASYNC_SIMPLE_COPTS + select({
1814
"@platforms//os:windows": [],
1915
# Clang gives incorrect warnings, See https://github.com/llvm/llvm-project/issues/56768
2016
"//conditions:default": ["-Wno-unsequenced"],
21-
})
17+
}),
18+
deps = [
19+
":hdrs_dep",
20+
"//:async_simple",
21+
"//async_simple/test:gtest_main",
22+
],
2223
)

‎async_simple/coro/test/GeneratorTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class GeneratorTest : public FUTURE_TESTBASE {
228228

229229
TEST_F(GeneratorTest, testIterator) {
230230
size_t n = 15;
231-
for (int j = 0; int i : fibonacci_sequence(n)) {
231+
for (int j = 0; auto i : fibonacci_sequence(n)) {
232232
EXPECT_EQ(i, fibonacci_expected[j++]);
233233
}
234234
}

‎async_simple/coro/test/LazyTest.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ TEST_F(LazyTest, testCollectAnyVariadicWithCancel) {
14381438
collectAny<SignalType::Terminate>(
14391439
my_sleep(10ms, SignalType::Terminate, false),
14401440
my_sleep(5s, SignalType::Terminate, true, false)));
1441-
EXPECT_EQ(result.index(), 1);
1441+
EXPECT_EQ(result.index(), 1u);
14421442
auto slot2 = co_await CurrentSlot{};
14431443
EXPECT_EQ(slot, slot2);
14441444
}()
@@ -1454,7 +1454,7 @@ TEST_F(LazyTest, testCollectAnyVariadicWithCancel) {
14541454
collectAny<SignalType::None>(
14551455
my_sleep(10ms, SignalType::None, false),
14561456
my_sleep(200ms, SignalType::None, false)));
1457-
EXPECT_EQ(result.index(), 1);
1457+
EXPECT_EQ(result.index(), 1u);
14581458
auto slot2 = co_await CurrentSlot{};
14591459
EXPECT_EQ(slot, slot2);
14601460
}()
@@ -1468,7 +1468,7 @@ TEST_F(LazyTest, testCollectAnyVariadicWithCancel) {
14681468
collectAny<SignalType::None>(
14691469
my_sleep(10ms, SignalType::None, false),
14701470
my_sleep(200ms, SignalType::Terminate)));
1471-
EXPECT_EQ(result.index(), 1);
1471+
EXPECT_EQ(result.index(), 1u);
14721472
auto slot2 = co_await CurrentSlot{};
14731473
EXPECT_EQ(slot, slot2);
14741474
}()
@@ -1491,7 +1491,7 @@ TEST_F(LazyTest, testCollectAnyWithCancel) {
14911491
v3.push_back(collectAny<SignalType::Terminate>(std::move(v1)));
14921492
v3.push_back(collectAny<SignalType::Terminate>(std::move(v2)));
14931493
auto result = co_await collectAny<SignalType::All>(std::move(v3));
1494-
EXPECT_EQ(result.index(), 1);
1494+
EXPECT_EQ(result.index(), 1u);
14951495
auto slot2 = co_await CurrentSlot{};
14961496
EXPECT_EQ(slot, slot2);
14971497
}()
@@ -1508,7 +1508,7 @@ TEST_F(LazyTest, testCollectAnyWithCancel) {
15081508
v3.push_back(collectAny<SignalType::Terminate>(std::move(v1)));
15091509
v3.push_back(collectAny<SignalType::None>(std::move(v2)));
15101510
auto result = co_await collectAny<SignalType::None>(std::move(v3));
1511-
EXPECT_EQ(result.index(), 1);
1511+
EXPECT_EQ(result.index(), 1u);
15121512
auto slot2 = co_await CurrentSlot{};
15131513
EXPECT_EQ(slot, slot2);
15141514
}()
@@ -1525,7 +1525,7 @@ TEST_F(LazyTest, testCollectAnyWithCancel) {
15251525
v3.push_back(collectAny<SignalType::Terminate>(std::move(v1)));
15261526
v3.push_back(collectAny<SignalType::None>(std::move(v2)));
15271527
auto result = co_await collectAny<SignalType::Terminate>(std::move(v3));
1528-
EXPECT_EQ(result.index(), 1);
1528+
EXPECT_EQ(result.index(), 1u);
15291529
auto slot2 = co_await CurrentSlot{};
15301530
EXPECT_EQ(slot, slot2);
15311531
}()

‎async_simple/coro/test/ResumeByScheduleTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ TEST(ResumeBySchedule, basic) {
130130
std::unique_lock guard(mut);
131131
cv.wait(guard, [&]() -> bool { return done_count == 100; });
132132
cbs.Stop();
133-
EXPECT_EQ(ex.checkin_count_, 0);
134-
EXPECT_LE(ex.schedule_count_, 200);
133+
EXPECT_EQ(ex.checkin_count_, 0u);
134+
EXPECT_LE(ex.schedule_count_, 200u);
135135
}
136136

137137
} // namespace coro

‎async_simple/executors/test/BUILD.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_test")
12
load("//bazel/config:copt.bzl", "ASYNC_SIMPLE_COPTS")
23

34
cc_test(
45
name = "async_simple_executor_test",
56
srcs = glob(["*.cpp"]),
7+
copts = ASYNC_SIMPLE_COPTS,
68
deps = [
79
"//:async_simple",
810
"//async_simple/test:gtest_main",
9-
],
10-
copts = ASYNC_SIMPLE_COPTS,
11+
],
1112
)

‎async_simple/executors/test/SimpleExecutorTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ TEST(SimpleExecutorTest, testNormal) {
5555
async_simple::util::move_only_function(std::move(move_only_functor)));
5656
std::unique_lock<std::mutex> guard(mut);
5757
cv.wait(guard, [&]() { return done_count == 2; });
58-
EXPECT_EQ(sum, 30);
58+
EXPECT_EQ(sum, 30u);
5959
}

‎async_simple/test/BUILD.bazel‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
12
load("//bazel/config:copt.bzl", "ASYNC_SIMPLE_COPTS")
23

34
cc_library(
45
name = "gtest_main",
56
srcs = ["dotest.cpp"],
67
hdrs = ["unittest.h"],
8+
copts = ASYNC_SIMPLE_COPTS,
9+
visibility = ["//visibility:public"],
710
deps = [
811
"//:simple_executors",
9-
"@com_google_googletest//:gtest"
12+
"@com_google_googletest//:gtest",
1013
],
11-
copts = ASYNC_SIMPLE_COPTS,
12-
visibility = ["//visibility:public"],
1314
)
1415

1516
cc_test(
1617
name = "async_simple_test",
1718
srcs = glob(["*Test.cpp"]),
19+
copts = ASYNC_SIMPLE_COPTS,
1820
deps = [
1921
"//:async_simple",
2022
"//async_simple/test:gtest_main",
2123
],
22-
copts = ASYNC_SIMPLE_COPTS,
2324
)

‎async_simple/test/CancellationTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ TEST_F(CancellationTest, testDerivedSignal) {
466466
SignalType::Terminate, [](SignalType type, Signal* signal) {
467467
auto mySignal = dynamic_cast<MySignal*>(signal);
468468
EXPECT_NE(mySignal, nullptr);
469-
EXPECT_EQ(mySignal->myState, 1);
469+
EXPECT_EQ(mySignal->myState, 1u);
470470
});
471471
mySignal->myState = 1;
472472
mySignal->emits(SignalType::Terminate);

0 commit comments

Comments
 (0)