Skip to content

Commit 9219c81

Browse files
committed
twister: make no-detailed-test-id default
Make this option default and reduce amount of details displayed by twister. This options has been enabled in CI for a while now with the intention of making it default. Signed-off-by: Anas Nashif <[email protected]>
1 parent b680587 commit 9219c81

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

.github/workflows/clang.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
export ZEPHYR_BASE=${PWD}
110110
export ZEPHYR_TOOLCHAIN_VARIANT=llvm
111111
112-
./scripts/twister -p native_sim --no-detailed-test-id --force-color --inline-logs -M -N -v --retry-failed 2 \
112+
./scripts/twister -p native_sim --force-color --inline-logs -M -N -v --retry-failed 2 \
113113
-T tests --subset ${{matrix.subset}}/2 -j 16
114114
115115
- name: Print ccache stats

.github/workflows/twister.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
run: |
9090
export ZEPHYR_BASE=${PWD}
9191
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
92-
python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --no-detailed-test-id --pull-request -t $TESTS_PER_BUILDER
92+
python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request -t $TESTS_PER_BUILDER
9393
if [ -s .testplan ]; then
9494
cat .testplan >> $GITHUB_ENV
9595
else
@@ -142,7 +142,7 @@ jobs:
142142
CCACHE_IGNOREOPTIONS: '-specs=* --specs=*'
143143
BSIM_OUT_PATH: /opt/bsim/
144144
BSIM_COMPONENTS_PATH: /opt/bsim/components
145-
TWISTER_COMMON: ' --test-config tests/test_config_ci.yaml --no-detailed-test-id --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
145+
TWISTER_COMMON: ' --test-config tests/test_config_ci.yaml --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
146146
WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered -j 32'
147147
PR_OPTIONS: ' --clobber-output --integration -j 16'
148148
PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered -j 16'
@@ -252,7 +252,7 @@ jobs:
252252
rm -f testplan.json
253253
export ZEPHYR_BASE=${PWD}
254254
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
255-
python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request --no-detailed-test-id
255+
python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request
256256
./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.json ${TWISTER_COMMON} ${PR_OPTIONS}
257257
if [ "${{matrix.subset}}" = "1" -a ${{needs.twister-build-prep.outputs.fullrun}} = 'True' ]; then
258258
./scripts/zephyr_module.py --twister-out module_tests.args

.github/workflows/twister_tests_blackbox.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O /tmp/twister-out"
135135
fi
136136
BASIC_FLAGS="--runtime-artifact-cleanup --force-color --inline-logs -v $EXTRA_TWISTER_FLAGS"
137-
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --platform qemu_x86 --create-rom-ram-report --footprint-report ROM --enable-size-report --footprint-from-buildlog $BASIC_FLAGS
137+
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --platform qemu_x86 --create-rom-ram-report --footprint-report ROM --enable-size-report --footprint-from-buildlog $BASIC_FLAGS --detailed-test-id
138138
139139
- name: Build firmware No. 7 - list tags
140140
working-directory: zephyr
@@ -146,7 +146,7 @@ jobs:
146146
EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O /tmp/twister-out"
147147
fi
148148
BASIC_FLAGS="--runtime-artifact-cleanup --force-color --inline-logs -v $EXTRA_TWISTER_FLAGS"
149-
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --list-tags $BASIC_FLAGS
149+
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --list-tags $BASIC_FLAGS --detailed-test-id
150150
151151
- name: Build firmware No. 8 - list tests
152152
working-directory: zephyr
@@ -170,7 +170,7 @@ jobs:
170170
EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O /tmp/twister-out"
171171
fi
172172
BASIC_FLAGS="--runtime-artifact-cleanup --force-color --inline-logs -v $EXTRA_TWISTER_FLAGS"
173-
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --platform qemu_x86 --report-dir . --report-name test_name --report-suffix suffix --report-summary 0 --report-all-options --report-filtered $BASIC_FLAGS
173+
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --platform qemu_x86 --report-dir . --report-name test_name --report-suffix suffix --report-summary 0 --report-all-options --report-filtered $BASIC_FLAGS --detailed-test-id
174174
175175
- name: Build firmware No. 10 - force platform and toolchain, log level, timestamps, logfile
176176
working-directory: zephyr
@@ -182,5 +182,5 @@ jobs:
182182
EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O /tmp/twister-out"
183183
fi
184184
BASIC_FLAGS="--runtime-artifact-cleanup --force-color --inline-logs -v $EXTRA_TWISTER_FLAGS"
185-
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --force-platform --platform qemu_x86 --force-toolchain --log-level WARNING --log-file log.file $BASIC_FLAGS
185+
./scripts/twister --sub-test kernel.multiprocessing.spinlock.minimallibc.spinlock.spinlock_basic --force-platform --platform qemu_x86 --force-toolchain --log-level WARNING --log-file log.file $BASIC_FLAGS --detailed-test-id
186186
rm log.file

scripts/ci/test_plan.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ def parse_args():
444444
"corresponding tests .yaml files. These scenarios "
445445
"will be skipped with quarantine as the reason.")
446446

447-
# Include paths in names by default.
448-
parser.set_defaults(detailed_test_id=True)
447+
# Do not include paths in names by default.
448+
parser.set_defaults(detailed_test_id=False)
449449

450450
return parser.parse_args()
451451

scripts/pylib/twister/twisterlib/environment.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,8 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
618618
"and 'sleep.usleep' test Case (where 'sleep' is its Ztest suite name "
619619
"and 'usleep' is Ztest test name.")
620620

621-
# Include paths in names by default.
622-
parser.set_defaults(detailed_test_id=True)
621+
# Do not include paths in names by default.
622+
parser.set_defaults(detailed_test_id=False)
623623

624624
parser.add_argument(
625625
"--detailed-skipped-report", action="store_true",

scripts/tests/twister/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def tesenv_obj(test_data, testsuites_dir, tmpdir_factory):
4444
""" Pytest fixture to initialize and return the class TestPlan object"""
4545
parser = add_parse_arguments()
4646
options = parse_arguments(parser, [])
47+
options.detailed_test_id = True
4748
env = TwisterEnv(options)
4849
env.board_roots = [os.path.join(test_data, "board_config", "1_level", "2_level")]
4950
env.test_roots = [os.path.join(testsuites_dir, 'tests', testsuites_dir, 'samples')]

0 commit comments

Comments
 (0)