Skip to content

Commit d677c39

Browse files
sawenzelclaude
andcommitted
Remove leftovers of the aliBuild sim-test check
The recipe now calls test/run_tests.sh and the build/O2DPG/sim/o2 check is gone, so three things no longer have a consumer. - run_analysisqc_tests.sh was a stub whose body is "exit 0". Its content moved into run_workflow_tests.sh in #1517 and nothing calls the file any more. - clean-ci.yml offered to clean a build of a check that no longer exists. - run_tests.sh added curl's include directory to ROOT_INCLUDE_PATH for the CCDB dictionary. alidist/curl.sh now does this with --root, and the published dailies carry it. test/README.md now points at "aliBuild build O2DPG-sim-tests" for changes that need an unreleased O2, which tests against your own build rather than dev. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
1 parent 80b1205 commit d677c39

4 files changed

Lines changed: 14 additions & 24 deletions

File tree

‎.github/workflows/clean-ci.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ name: Clean PR builds
1414
# Warning: the check_* keys are magic and must consist of the string
1515
# "check_" followed by the applicable check name exactly. The
1616
# "description" field is only the human-readable label for the input.
17-
'check_build/O2DPG/sim/o2':
18-
description: build/O2DPG/sim/o2
19-
type: boolean
20-
default: true
2117
'check_build/O2DPG/O2fst/o2':
2218
description: build/O2DPG/O2fst/o2
2319
type: boolean

‎test/README.md‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,17 @@ commit cannot pass it. Two escape hatches, in order of preference:
125125

126126
1. If the O2 change is already in a published daily, pin it: add a line
127127
`sim-tests-tag: daily-YYYYMMDD-HHMM-1` to the pull request description.
128-
2. If it is not published anywhere yet, touch `test/needs-o2-dev` with a
129-
one-line reason and a link to the O2 pull request. That enables
130-
`build/O2DPG/sim/o2dev`, which builds O2 from source against `dev`. It is
131-
much slower, so it is opt-in.
128+
2. If it is not published anywhere yet, run the tests against your own build:
129+
130+
```bash
131+
aliBuild build O2DPG-sim-tests
132+
```
133+
134+
This builds the O2sim stack from your work area and runs `run_tests.sh`
135+
against your O2DPG checkout, so it covers O2 changes that are not committed
136+
anywhere yet. It needs O2DPG as a development package (`aliBuild init
137+
O2DPG`); without one, the sub-tests stop with `is not a git repository`.
138+
139+
Touching `test/needs-o2-dev` makes the CVMFS check skip, which is useful to
140+
keep a pull request from being gated by a check that cannot pass for it. No
141+
check replaces it, so pair it with the command above.

‎test/run_analysisqc_tests.sh‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎test/run_tests.sh‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@ if [[ -n "${G4INSTALL:-}" ]] ; then
5151
sed -e 's/[^ ]* //' -e 's/G4/export G4/' -e 's/DATA /DATA=/')"
5252
fi
5353

54-
# O2's CCDB dictionary payload includes <curl/curl.h>. An aliBuild build
55-
# environment has curl's headers; a plain runtime environment from CVMFS does
56-
# not, and cling then dies compiling the payload. Derive the prefix from
57-
# curl-config rather than hardcoding a version.
58-
if command -v curl-config > /dev/null 2>&1 ; then
59-
curl_include=$(curl-config --prefix 2>/dev/null)/include
60-
if [[ -f "${curl_include}/curl/curl.h" && ":${ROOT_INCLUDE_PATH:-}:" != *":${curl_include}:"* ]] ; then
61-
export ROOT_INCLUDE_PATH="${curl_include}${ROOT_INCLUDE_PATH:+:${ROOT_INCLUDE_PATH}}"
62-
echo "Added ${curl_include} to ROOT_INCLUDE_PATH for the CCDB dictionary"
63-
fi
64-
fi
65-
6654
# LHAPDF data, needed by several generator configurations.
6755
if [[ -z "${LHAPDF_DATA_PATH:-}" && -n "${LHAPDF_ROOT:-}" ]] ; then
6856
export LHAPDF_DATA_PATH="${LHAPDF_ROOT}/share/LHAPDF:${LHAPDF_PDFSETS_ROOT:-}/share/LHAPDF"

0 commit comments

Comments
 (0)