Skip to content

Commit

Permalink
run_qemu.sh: stop --cxl-test-run from forcing --cxl QEMU devices
Browse files Browse the repository at this point in the history
QEMU devices are not required to run cxl tests, so let the user decide
what they want.

Autorun has very recently been fixed (commit 17d0473 and others in
PR pmem#101) and had been broken for likely 1 or 2 years which means no one
was using it which means it's a great time to alter the behavior.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
  • Loading branch information
marc-hb committed Jan 23, 2025
1 parent f0d88a0 commit 1d8768a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion parser_generator.m4
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exit 11 #)Created by argbash-init v2.9.0
# ARG_OPTIONAL_BOOLEAN([cxl-debug], , [Enable 'dyndbg' for CXL modules.], )
# ARG_OPTIONAL_SINGLE([cxl-pmems], , [Number of QEMU CXL memdevs with pmem (0-4). Rest will default to volatile], [2])
# ARG_OPTIONAL_BOOLEAN([cxl-test], , [Setup an environment for CXL unit tests\n. Include CXL 'extra' modules to mock a CXL hierarchy using the kernel's 'cxl_test' facility], )
# ARG_OPTIONAL_BOOLEAN([cxl-test-run], , [CXL unit test mode. Implies the following: cxl\n cxl-debug\n cxl-test\n autorun=rq_cxl_tests.sh\n log=/tmp/rq_<instance>.log\n post-script=rq_cxl_results.sh\n timeout=5\n Non-boolean parameters above can be overridden by manually supplying the corresponding option(s)\n], )
# ARG_OPTIONAL_BOOLEAN([cxl-test-run], , [CXL unit test mode. Implies the following:\n cxl-debug\n cxl-test\n autorun=rq_cxl_tests.sh\n log=/tmp/rq_<instance>.log\n post-script=rq_cxl_results.sh\n timeout=5\n Non-boolean parameters above can be overridden by manually supplying the corresponding option(s)\n], )
# ARG_OPTIONAL_BOOLEAN([dax-debug], , [Enable 'dyndbg' for DAX modules.], )
# ARG_OPTIONAL_BOOLEAN([debug], [v], [Debug script problems (enables set -x)], )
# ARG_OPTIONAL_BOOLEAN([ndctl-build], , [Enable ndctl build in root image], [on])
Expand Down
1 change: 0 additions & 1 deletion run_qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ process_options_logic()
set -x
fi
if [[ $_arg_cxl_test_run == "on" ]]; then
_arg_cxl="on"
_arg_cxl_debug="on"
_arg_cxl_test="on"
if [[ ! $_arg_autorun ]]; then
Expand Down

0 comments on commit 1d8768a

Please # to comment.