Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

Commit b106c6c

Browse files
committed
Squashed 'deps/ccommon/' changes from 9caf864d..cc7b9fc5
cc7b9fc5 increase tick interval for cc_wheel tests (twitter#255) 9a3255dd Delete flaky assert within check_pipe (twitter#254) git-subtree-dir: deps/ccommon git-subtree-split: cc7b9fc5497347c911574f9a761317e300954f8f
1 parent e196b0c commit b106c6c

File tree

3 files changed

+37
-3
lines changed

3 files changed

+37
-3
lines changed

.github/workflows/cmake.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
on:
2+
push:
3+
pull_request:
4+
5+
env:
6+
CARGO_TERM_COLOR: always
7+
RUST_BACKTRACE: full
8+
9+
jobs:
10+
build:
11+
strategy:
12+
matrix:
13+
os: [ ubuntu-18.04, macos-10.15 ]
14+
profile: [ Release ]
15+
name: build-${{ matrix.os }}-${{ matrix.profile }}
16+
runs-on: ${{ matrix.os }}
17+
steps:
18+
- uses: actions/checkout@v2
19+
20+
- name: Configure
21+
run: |
22+
mkdir -p _build
23+
cmake -B _build -S . \
24+
-DCMAKE_BUILD_TYPE=${{ matrix.profile }} \
25+
-DBUILD_AND_INSTALL_CHECK=yes
26+
27+
- name: Build
28+
run: |
29+
cmake --build _build
30+
31+
- name: Test
32+
run: |
33+
cmake --build _build --target test
34+
env:
35+
CTEST_OUTPUT_ON_FAILURE: 1

test/channel/pipe/check_pipe.c

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ START_TEST(test_read_blocking)
128128
pthread_join(thread, NULL);
129129

130130
ck_assert_int_ge(duration_us(&duration), SLEEP_TIME - TOLERANCE_UNDER);
131-
ck_assert_int_le(duration_us(&duration), SLEEP_TIME + TOLERANCE_OVER);
132131

133132
ck_assert_str_eq(write_message, read_message);
134133

test/time/wheel/check_wheel.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ _incr_cb(void *v)
4242

4343
START_TEST(test_timing_wheel_basic)
4444
{
45-
#define TICK_NS 1000000
45+
#define TICK_NS 100000000
4646
#define NSLOT 3
4747
#define NTICK 2
4848

@@ -182,7 +182,7 @@ END_TEST
182182

183183
START_TEST(test_timing_wheel_edge_case)
184184
{
185-
#define TICK_NS 1000000
185+
#define TICK_NS 100000000
186186
#define NSLOT 3
187187
#define NTICK 2
188188

0 commit comments

Comments
 (0)