Skip to content

Commit

Permalink
cidbg
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
  • Loading branch information
ac000 committed Oct 17, 2024
1 parent 75b7231 commit feed2ce
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ jobs:

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

- name: Make python3
Expand Down Expand Up @@ -351,10 +352,10 @@ jobs:
namei -l ${{ github.workspace }}
# Install python3 if not present
- uses: actions/setup-python@v5
with:
python-version: '3'
if: steps.metadata.outputs.module != 'wasm'
# - uses: actions/setup-python@v5
# with:
# python-version: '3'
# if: steps.metadata.outputs.module != 'wasm'

- name: Install pytest
run: |
Expand All @@ -367,6 +368,7 @@ jobs:
if [ "${{ matrix.build }}" == "wasm-wasi-component" ]; then
pytest-3 --print-log ${{ steps.metadata.outputs.testpath }}
else
ls -l /opt/hostedtoolcache/Python/3.12.7/x64/lib/
sudo -E pytest-3 --print-log ${{ steps.metadata.outputs.testpath }}
fi
if: steps.metadata.outputs.module != 'wasm'
5 changes: 5 additions & 0 deletions src/nxt_isolation.c
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ nxt_isolation_set_lang_mounts(nxt_task_t *task, nxt_process_t *process,
}

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

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

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

for (i = 0; i < n; i++) {
Expand All @@ -790,6 +792,9 @@ nxt_isolation_prepare_rootfs(nxt_task_t *task, nxt_process_t *process)
if (nxt_slow_path(ret != NXT_OK)) {
goto undo;
}

printf("%s: mounted [%s] -> [%s]\n", __func__,
(const char *)mnt[i].src, (const char *)dst);
}

return NXT_OK;
Expand Down

0 comments on commit feed2ce

Please sign in to comment.