Skip to content

Commit 80d079f

Browse files
qdeslandesqdeslandes
committed
debug
1 parent 57dcbe5 commit 80d079f

File tree

2 files changed

+147
-143
lines changed

2 files changed

+147
-143
lines changed

Diff for: ‎.github/workflows/ci.yaml

+143-143
Original file line numberDiff line numberDiff line change
@@ -22,83 +22,83 @@ permissions:
2222
pull-requests: write
2323

2424
jobs:
25-
create-images:
26-
timeout-minutes: 15
27-
strategy:
28-
matrix:
29-
host:
30-
- { name: ubuntu-24.04, arch: x64 }
31-
- { name: 4-core-ubuntu-arm, arch: arm64 }
32-
distribution:
33-
- { name: fedora, version: "41" }
34-
- { name: fedora, version: "40" }
35-
- { name: fedora, version: "39" }
36-
- { name: ubuntu, version: "24.10" }
37-
- { name: ubuntu, version: "24.04" }
38-
runs-on: [ "${{ matrix.host.name }}" ]
39-
name: "Image: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
40-
steps:
41-
- name: Checkout bpfilter
42-
uses: actions/checkout@v2
43-
- name: Set up Docker Buildx
44-
uses: docker/setup-buildx-action@v3
45-
- name: Log to GHCR
46-
uses: docker/login-action@v2
47-
with:
48-
registry: ${{ env.REGISTRY }}
49-
username: ${{ github.actor }}
50-
password: ${{ secrets.GITHUB_TOKEN }}
51-
# Build the container images and use the existing images as cache
52-
- name: Build and push container image
53-
uses: docker/build-push-action@v4
54-
with:
55-
file: .github/${{ matrix.distribution.name }}-${{ matrix.distribution.version }}.Dockerfile
56-
push: ${{ github.ref == 'refs/heads/main' && 'true' || 'false' }}
57-
tags: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
58-
cache-from: type=gha,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
59-
cache-to: type=gha,mode=max,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
25+
# create-images:
26+
# timeout-minutes: 15
27+
# strategy:
28+
# matrix:
29+
# host:
30+
# - { name: ubuntu-24.04, arch: x64 }
31+
# - { name: 4-core-ubuntu-arm, arch: arm64 }
32+
# distribution:
33+
# - { name: fedora, version: "41" }
34+
# - { name: fedora, version: "40" }
35+
# - { name: fedora, version: "39" }
36+
# - { name: ubuntu, version: "24.10" }
37+
# - { name: ubuntu, version: "24.04" }
38+
# runs-on: [ "${{ matrix.host.name }}" ]
39+
# name: "Image: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
40+
# steps:
41+
# - name: Checkout bpfilter
42+
# uses: actions/checkout@v2
43+
# - name: Set up Docker Buildx
44+
# uses: docker/setup-buildx-action@v3
45+
# - name: Log to GHCR
46+
# uses: docker/login-action@v2
47+
# with:
48+
# registry: ${{ env.REGISTRY }}
49+
# username: ${{ github.actor }}
50+
# password: ${{ secrets.GITHUB_TOKEN }}
51+
# # Build the container images and use the existing images as cache
52+
# - name: Build and push container image
53+
# uses: docker/build-push-action@v4
54+
# with:
55+
# file: .github/${{ matrix.distribution.name }}-${{ matrix.distribution.version }}.Dockerfile
56+
# push: ${{ github.ref == 'refs/heads/main' && 'true' || 'false' }}
57+
# tags: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
58+
# cache-from: type=gha,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
59+
# cache-to: type=gha,mode=max,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
6060

61-
build:
62-
needs: create-images
63-
timeout-minutes: 5
64-
strategy:
65-
matrix:
66-
host:
67-
- { name: ubuntu-24.04, arch: x64 }
68-
- { name: 4-core-ubuntu-arm, arch: arm64 }
69-
distribution:
70-
- { name: fedora, version: "41" }
71-
- { name: fedora, version: "40" }
72-
- { name: fedora, version: "39" }
73-
- { name: ubuntu, version: "24.10" }
74-
- { name: ubuntu, version: "24.04" }
75-
runs-on: [ "${{ matrix.host.name }}" ]
76-
container: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
77-
name: "Build: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
78-
steps:
79-
- name: Checkout bpfilter
80-
uses: actions/checkout@v2
81-
- name: Configure the build
82-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DNO_BENCHMARKS=1
83-
- name: Build all
84-
run: make -C $GITHUB_WORKSPACE/build -j `nproc`
61+
# build:
62+
# needs: create-images
63+
# timeout-minutes: 5
64+
# strategy:
65+
# matrix:
66+
# host:
67+
# - { name: ubuntu-24.04, arch: x64 }
68+
# - { name: 4-core-ubuntu-arm, arch: arm64 }
69+
# distribution:
70+
# - { name: fedora, version: "41" }
71+
# - { name: fedora, version: "40" }
72+
# - { name: fedora, version: "39" }
73+
# - { name: ubuntu, version: "24.10" }
74+
# - { name: ubuntu, version: "24.04" }
75+
# runs-on: [ "${{ matrix.host.name }}" ]
76+
# container: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
77+
# name: "Build: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
78+
# steps:
79+
# - name: Checkout bpfilter
80+
# uses: actions/checkout@v2
81+
# - name: Configure the build
82+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DNO_BENCHMARKS=1
83+
# - name: Build all
84+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc`
8585

86-
check:
87-
needs: create-images
88-
timeout-minutes: 5
89-
runs-on: [ "ubuntu-24.04" ]
90-
container: ghcr.io/facebook/bpfilter:fedora-41-x64
91-
name: "Check"
92-
steps:
93-
- name: Checkout bpfilter
94-
uses: actions/checkout@v2
95-
- name: Configure the build
96-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
97-
- name: Build
98-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` check
86+
# check:
87+
# needs: create-images
88+
# timeout-minutes: 5
89+
# runs-on: [ "ubuntu-24.04" ]
90+
# container: ghcr.io/facebook/bpfilter:fedora-41-x64
91+
# name: "Check"
92+
# steps:
93+
# - name: Checkout bpfilter
94+
# uses: actions/checkout@v2
95+
# - name: Configure the build
96+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
97+
# - name: Build
98+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` check
9999

100100
test:
101-
needs: create-images
101+
# needs: create-images
102102
timeout-minutes: 5
103103
strategy:
104104
matrix:
@@ -131,74 +131,74 @@ jobs:
131131
path: build/output/tests
132132
key: tests-results
133133

134-
benchmark:
135-
needs: create-images
136-
timeout-minutes: 5
137-
strategy:
138-
matrix:
139-
host:
140-
- { name: ubuntu-24.04, arch: x64 }
141-
- { name: 4-core-ubuntu-arm, arch: arm64 }
142-
runs-on: [ "${{ matrix.host.name }}" ]
143-
container:
144-
image: ghcr.io/facebook/bpfilter:fedora-41-${{ matrix.host.arch }}
145-
options: --privileged
146-
name: "Benchmark: ${{ matrix.host.arch }}"
147-
steps:
148-
- name: Checkout bpfilter
149-
uses: actions/checkout@v2
150-
- name: Ensure we can read the Git repository
151-
run: git config --global --add safe.directory $GITHUB_WORKSPACE
152-
- name: Configure the build
153-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DWITH_BENCHMARK=on
154-
- name: Restore the cached benchmark results
155-
uses: actions/cache/restore@v4
156-
with:
157-
path: build/output/benchmarks
158-
key: benchmarks-results
159-
- name: Build
160-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` benchmark
161-
- name: Cache the benchmark results
162-
uses: actions/cache/save@v4
163-
if: matrix.host.arch == 'x64' && github.ref == 'refs/heads/main'
164-
with:
165-
path: build/output/benchmarks
166-
key: benchmarks-results
134+
# benchmark:
135+
# needs: create-images
136+
# timeout-minutes: 5
137+
# strategy:
138+
# matrix:
139+
# host:
140+
# - { name: ubuntu-24.04, arch: x64 }
141+
# - { name: 4-core-ubuntu-arm, arch: arm64 }
142+
# runs-on: [ "${{ matrix.host.name }}" ]
143+
# container:
144+
# image: ghcr.io/facebook/bpfilter:fedora-41-${{ matrix.host.arch }}
145+
# options: --privileged
146+
# name: "Benchmark: ${{ matrix.host.arch }}"
147+
# steps:
148+
# - name: Checkout bpfilter
149+
# uses: actions/checkout@v2
150+
# - name: Ensure we can read the Git repository
151+
# run: git config --global --add safe.directory $GITHUB_WORKSPACE
152+
# - name: Configure the build
153+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DWITH_BENCHMARK=on
154+
# - name: Restore the cached benchmark results
155+
# uses: actions/cache/restore@v4
156+
# with:
157+
# path: build/output/benchmarks
158+
# key: benchmarks-results
159+
# - name: Build
160+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` benchmark
161+
# - name: Cache the benchmark results
162+
# uses: actions/cache/save@v4
163+
# if: matrix.host.arch == 'x64' && github.ref == 'refs/heads/main'
164+
# with:
165+
# path: build/output/benchmarks
166+
# key: benchmarks-results
167167

168-
doc:
169-
needs: [ test, benchmark ]
170-
timeout-minutes: 5
171-
runs-on: [ "ubuntu-24.04" ]
172-
container: ghcr.io/facebook/bpfilter:fedora-41-x64
173-
name: "Documentation"
174-
steps:
175-
- name: Checkout bpfilter
176-
uses: actions/checkout@v2
177-
- name: Configure the build
178-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
179-
- name: Restore the cached tests results
180-
uses: actions/cache@v4
181-
with:
182-
path: build/output/tests
183-
key: tests-results
184-
- name: Restore the cached benchmarks results
185-
uses: actions/cache@v4
186-
with:
187-
path: build/output/benchmarks
188-
key: benchmarks-results
189-
- name: Build
190-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` doc
191-
- name: Fix permissions
192-
if: github.ref == 'refs/heads/main'
193-
run: |
194-
chmod -c -R +rX "$GITHUB_WORKSPACE/build/doc/html" | while read line; do
195-
echo "::warning title=Invalid file permissions automatically fixed::$line"
196-
done
197-
- name: Upload artifact
198-
uses: actions/upload-pages-artifact@v3
199-
if: github.ref == 'refs/heads/main'
200-
with:
201-
path: build/doc/html
202-
- name: Deploy to GitHub Pages
203-
uses: actions/deploy-pages@v4
204-
if: github.ref == 'refs/heads/main'
168+
# doc:
169+
# needs: [ test, benchmark ]
170+
# timeout-minutes: 5
171+
# runs-on: [ "ubuntu-24.04" ]
172+
# container: ghcr.io/facebook/bpfilter:fedora-41-x64
173+
# name: "Documentation"
174+
# steps:
175+
# - name: Checkout bpfilter
176+
# uses: actions/checkout@v2
177+
# - name: Configure the build
178+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
179+
# - name: Restore the cached tests results
180+
# uses: actions/cache@v4
181+
# with:
182+
# path: build/output/tests
183+
# key: tests-results
184+
# - name: Restore the cached benchmarks results
185+
# uses: actions/cache@v4
186+
# with:
187+
# path: build/output/benchmarks
188+
# key: benchmarks-results
189+
# - name: Build
190+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` doc
191+
# - name: Fix permissions
192+
# if: github.ref == 'refs/heads/main'
193+
# run: |
194+
# chmod -c -R +rX "$GITHUB_WORKSPACE/build/doc/html" | while read line; do
195+
# echo "::warning title=Invalid file permissions automatically fixed::$line"
196+
# done
197+
# - name: Upload artifact
198+
# uses: actions/upload-pages-artifact@v3
199+
# if: github.ref == 'refs/heads/main'
200+
# with:
201+
# path: build/doc/html
202+
# - name: Deploy to GitHub Pages
203+
# uses: actions/deploy-pages@v4
204+
# if: github.ref == 'refs/heads/main'

Diff for: ‎tests/harness/test.c

+4
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ int bf_test_suite_add_test(bf_test_suite *suite, const char *group_name,
187187
bf_test_group *group;
188188
int r;
189189

190+
bf_info("suite=%p", suite);
191+
bf_info("group_name=%p", group_name);
192+
bf_info("test=%p", test);
193+
bf_info("group_name=%s", group_name);
190194
bf_assert(suite && group_name && test);
191195

192196
group = bf_test_suite_get_group(suite, group_name);

0 commit comments

Comments
 (0)