Skip to content

Commit feed2ce

Browse files
committed
cidbg
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
1 parent 75b7231 commit feed2ce

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/ci.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,8 @@ jobs:
266266

267267
- name: Configure python3
268268
run: |
269-
sudo ./configure python --config=python3-config
269+
sudo ./configure python --config=${Python_ROOT_DIR}/bin/python3-config --lib-path=$LD_LIBRARY_PATH
270+
cat build/include/nxt_python3_mounts.h
270271
if: steps.metadata.outputs.module == 'python'
271272

272273
- name: Make python3
@@ -351,10 +352,10 @@ jobs:
351352
namei -l ${{ github.workspace }}
352353
353354
# Install python3 if not present
354-
- uses: actions/setup-python@v5
355-
with:
356-
python-version: '3'
357-
if: steps.metadata.outputs.module != 'wasm'
355+
# - uses: actions/setup-python@v5
356+
# with:
357+
# python-version: '3'
358+
# if: steps.metadata.outputs.module != 'wasm'
358359

359360
- name: Install pytest
360361
run: |
@@ -367,6 +368,7 @@ jobs:
367368
if [ "${{ matrix.build }}" == "wasm-wasi-component" ]; then
368369
pytest-3 --print-log ${{ steps.metadata.outputs.testpath }}
369370
else
371+
ls -l /opt/hostedtoolcache/Python/3.12.7/x64/lib/
370372
sudo -E pytest-3 --print-log ${{ steps.metadata.outputs.testpath }}
371373
fi
372374
if: steps.metadata.outputs.module != 'wasm'

src/nxt_isolation.c

+5
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ nxt_isolation_set_lang_mounts(nxt_task_t *task, nxt_process_t *process,
625625
}
626626

627627
n = mounts->nelts;
628+
printf("%s: nr mounts [%lu]\n", __func__, n);
628629
mnt = mounts->elts;
629630
lang_mnt = lang_mounts->elts;
630631

@@ -764,6 +765,7 @@ nxt_isolation_prepare_rootfs(nxt_task_t *task, nxt_process_t *process)
764765
mounts = process->isolation.mounts;
765766

766767
n = mounts->nelts;
768+
printf("%s: nr mounts [%lu]\n", __func__, n);
767769
mnt = mounts->elts;
768770

769771
for (i = 0; i < n; i++) {
@@ -790,6 +792,9 @@ nxt_isolation_prepare_rootfs(nxt_task_t *task, nxt_process_t *process)
790792
if (nxt_slow_path(ret != NXT_OK)) {
791793
goto undo;
792794
}
795+
796+
printf("%s: mounted [%s] -> [%s]\n", __func__,
797+
(const char *)mnt[i].src, (const char *)dst);
793798
}
794799

795800
return NXT_OK;

0 commit comments

Comments
 (0)