Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ jobs:
run: |
set -euo pipefail
PY="$(command -v python3 || command -v python)"
"$PY" tools/test_template.py --toolchain "${{ matrix.toolchain }}"
"$PY" tools/ci/test_template.py --toolchain "${{ matrix.toolchain }}"

- name: Check release coordinate and bilingual entry pages
if: matrix.name == 'linux-gcc' && matrix.arch == 'x86_64'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ compile_commands.json
*.dwo
*.d

# Local test scratch (tools/test_template.py keeps its workspace here so the
# Local test scratch (tools/ci/test_template.py keeps its workspace here so the
# mcpp shim can resolve the project-pinned toolchain)
.tmp/

Expand Down
2 changes: 1 addition & 1 deletion docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ keeps byte-identical notices.
configuration records the incremental TU count and mtimes.
- `tools/check_mwrap_release.py`: identity, version scheme, tag, licence split and
retained-document bytes.
- `tools/test_template.py`: installs an isolated `MCPP_HOME` fixture, runs a real
- `tools/ci/test_template.py`: installs an isolated `MCPP_HOME` fixture, runs a real
`mcpp new`, parses the rendered manifest (complete selector, version, features),
then builds and runs the project — no sed rendering.
- `tools/package-source.sh`: `boost-m-<version>.tar.gz` from the tracked tree,
Expand Down
2 changes: 1 addition & 1 deletion docs/architecture.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ feature(两种 Boost.Test 形态绝不能链接在一起)。
必须干净;在同一配置上再做一次构建,记录增量 TU 数量和 mtime。
- `tools/check_mwrap_release.py`:校验标识、版本方案、tag、许可证拆分以及保留
文档的字节。
- `tools/test_template.py`:安装隔离的 `MCPP_HOME` 测试环境,执行真实的
- `tools/ci/test_template.py`:安装隔离的 `MCPP_HOME` 测试环境,执行真实的
`mcpp new`,解析渲染出的清单(完整选择器、版本、features),然后构建并运行
该项目——不使用 sed 渲染。
- `tools/package-source.sh`:从受版本控制的代码树生成
Expand Down
8 changes: 4 additions & 4 deletions tools/test_template.py → tools/ci/test_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
dependency is redirected to the fixture with the same parser, features kept.

Usage:
python3 tools/test_template.py # default template
python3 tools/test_template.py --template lib # a named template
python3 tools/test_template.py --keep # leave the fixture on disk
python3 tools/ci/test_template.py # default template
python3 tools/ci/test_template.py --template lib # a named template
python3 tools/ci/test_template.py --keep # leave the fixture on disk
"""
import argparse
import json
Expand All @@ -27,7 +27,7 @@
import tempfile
import tomllib

ROOT = Path(__file__).resolve().parents[1]
ROOT = Path(__file__).resolve().parents[2]


def package_identity():
Expand Down
14 changes: 0 additions & 14 deletions tools/template_smoke.sh

This file was deleted.

Loading