| Message ID | 20240702215804.2201271-28-jim.cromie@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y | expand |
On 02/07/2024 18:57, Jim Cromie wrote: > Several tests are dependent upon config choices. Lets avoid failing > where that is noise. > > The KCONFIG_CONFIG var exists to convey the config-file around. If > the var names a file, read it and extract the relevant CONFIG items, > and use them to skip the dependent tests, thus avoiding the fails that > would follow, and the disruption to whatever CI is running these > selftests. > > If the envar doesn't name a config-file, ".config" is assumed. > > CONFIG_DYNAMIC_DEBUG=y: > > basic-tests() and comma-terminator-tests() test for the presence of > the builtin pr_debugs in module/main.c, which I deemed stable and > therefore safe to count. That said, the test fails if only > CONFIG_DYNAMIC_DEBUG_CORE=y is set. It could be rewritten to test > against test-dynamic-debug.ko, but that just trades one config > dependence for another. > > CONFIG_TEST_DYNAMIC_DEBUG=m > > As written, test_percent_splitting() modprobes test_dynamic_debug, > enables several classes, and count them. It could be re-written to > work for the builtin module also, but builtin test modules are not a > common or desirable build/config. > > CONFIG_TEST_DYNAMIC_DEBUG=m && CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m > > test_mod_submod() recaps the bug found in DRM-CI where drivers werent If this fixes any but listed in drm/ci/xfails folder, please update it too. Regards, Helen > enabled by drm.debug=<bits>. It modprobes both test_dynamic_debug & > test_dynamic_debug_submod, so it depends on a loadable modules config. > > It could be rewritten to work in a builtin parent config; DRM=y is > common enough to be pertinent, but testing that config also wouldn't > really test anything more fully than all-loadable modules, since they > default together. > > Signed-off-by: Jim Cromie <jim.cromie@gmail.com> > > fixup-kconfig > --- > .../dynamic_debug/dyndbg_selftest.sh | 45 ++++++++++++++++++- > 1 file changed, 44 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh > index fccd2012b548..d09ef26b2308 100755 > --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh > +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh > @@ -11,6 +11,30 @@ CYAN="\033[0;36m" > NC="\033[0;0m" > error_msg="" > > +[ -e /proc/dynamic_debug/control ] || { > + echo -e "${RED}: this test requires CONFIG_DYNAMIC_DEBUG=y ${NC}" > + exit 0 # nothing to test here, no good reason to fail. > +} > + > +# need info to avoid failures due to untestable configs > + > +[ -f "$KCONFIG_CONFIG" ] || KCONFIG_CONFIG=".config" > +if [ -f "$KCONFIG_CONFIG" ]; then > + echo "# consulting KCONFIG_CONFIG: $KCONFIG_CONFIG" > + grep -q "CONFIG_DYNAMIC_DEBUG=y" $KCONFIG_CONFIG ; LACK_DD_BUILTIN=$? > + grep -q "CONFIG_TEST_DYNAMIC_DEBUG=m" $KCONFIG_CONFIG ; LACK_TMOD=$? > + grep -q "CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m" $KCONFIG_CONFIG ; LACK_TMOD_SUBMOD=$? > + if [ $V -eq 1 ]; then > + echo LACK_DD_BUILTIN: $LACK_DD_BUILTIN > + echo LACK_TMOD: $LACK_TMOD > + echo LACK_TMOD_SUBMOD: $LACK_TMOD_SUBMOD > + fi > +else > + LACK_DD_BUILTIN=0 > + LACK_TMOD=0 > + LACK_TMOD_SUBMOD=0 > +fi > + > function vx () { > echo $1 > /sys/module/dynamic_debug/parameters/verbose > } > @@ -192,6 +216,10 @@ function check_err_msg() { > > function basic_tests { > echo -e "${GREEN}# BASIC_TESTS ${NC}" > + if [ $LACK_DD_BUILTIN -eq 1 ]; then > + echo "SKIP" > + return > + fi > ddcmd =_ # zero everything (except class'd sites) > check_match_ct =p 0 > # there are several main's :-/ > @@ -214,6 +242,10 @@ EOF > > function comma_terminator_tests { > echo -e "${GREEN}# COMMA_TERMINATOR_TESTS ${NC}" > + if [ $LACK_DD_BUILTIN -eq 1 ]; then > + echo "SKIP" > + return > + fi > # try combos of spaces & commas > check_match_ct '\[params\]' 4 -r > ddcmd module,params,=_ # commas as spaces > @@ -226,9 +258,12 @@ function comma_terminator_tests { > ddcmd =_ > } > > - > function test_percent_splitting { > echo -e "${GREEN}# TEST_PERCENT_SPLITTING - multi-command splitting on % ${NC}" > + if [ $LACK_TMOD -eq 1 ]; then > + echo "SKIP" > + return > + fi > ifrmmod test_dynamic_debug_submod > ifrmmod test_dynamic_debug > ddcmd =_ > @@ -248,6 +283,14 @@ function test_percent_splitting { > > function test_mod_submod { > echo -e "${GREEN}# TEST_MOD_SUBMOD ${NC}" > + if [ $LACK_TMOD -eq 1 ]; then > + echo "SKIP" > + return > + fi > + if [ $LACK_TMOD_SUBMOD -eq 1 ]; then > + echo "SKIP" > + return > + fi > ifrmmod test_dynamic_debug_submod > ifrmmod test_dynamic_debug > ddcmd =_
On Wed, Jul 10, 2024 at 2:23 PM Helen Koike <helen.koike@collabora.com> wrote: > > > > On 02/07/2024 18:57, Jim Cromie wrote: > > Several tests are dependent upon config choices. Lets avoid failing > > where that is noise. > > ... > > > > test_mod_submod() recaps the bug found in DRM-CI where drivers werent > > If this fixes any but listed in drm/ci/xfails folder, please update it too. > > Regards, > Helen This looks like a good avenue to follow, thanks for the hint
diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh index fccd2012b548..d09ef26b2308 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -11,6 +11,30 @@ CYAN="\033[0;36m" NC="\033[0;0m" error_msg="" +[ -e /proc/dynamic_debug/control ] || { + echo -e "${RED}: this test requires CONFIG_DYNAMIC_DEBUG=y ${NC}" + exit 0 # nothing to test here, no good reason to fail. +} + +# need info to avoid failures due to untestable configs + +[ -f "$KCONFIG_CONFIG" ] || KCONFIG_CONFIG=".config" +if [ -f "$KCONFIG_CONFIG" ]; then + echo "# consulting KCONFIG_CONFIG: $KCONFIG_CONFIG" + grep -q "CONFIG_DYNAMIC_DEBUG=y" $KCONFIG_CONFIG ; LACK_DD_BUILTIN=$? + grep -q "CONFIG_TEST_DYNAMIC_DEBUG=m" $KCONFIG_CONFIG ; LACK_TMOD=$? + grep -q "CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m" $KCONFIG_CONFIG ; LACK_TMOD_SUBMOD=$? + if [ $V -eq 1 ]; then + echo LACK_DD_BUILTIN: $LACK_DD_BUILTIN + echo LACK_TMOD: $LACK_TMOD + echo LACK_TMOD_SUBMOD: $LACK_TMOD_SUBMOD + fi +else + LACK_DD_BUILTIN=0 + LACK_TMOD=0 + LACK_TMOD_SUBMOD=0 +fi + function vx () { echo $1 > /sys/module/dynamic_debug/parameters/verbose } @@ -192,6 +216,10 @@ function check_err_msg() { function basic_tests { echo -e "${GREEN}# BASIC_TESTS ${NC}" + if [ $LACK_DD_BUILTIN -eq 1 ]; then + echo "SKIP" + return + fi ddcmd =_ # zero everything (except class'd sites) check_match_ct =p 0 # there are several main's :-/ @@ -214,6 +242,10 @@ EOF function comma_terminator_tests { echo -e "${GREEN}# COMMA_TERMINATOR_TESTS ${NC}" + if [ $LACK_DD_BUILTIN -eq 1 ]; then + echo "SKIP" + return + fi # try combos of spaces & commas check_match_ct '\[params\]' 4 -r ddcmd module,params,=_ # commas as spaces @@ -226,9 +258,12 @@ function comma_terminator_tests { ddcmd =_ } - function test_percent_splitting { echo -e "${GREEN}# TEST_PERCENT_SPLITTING - multi-command splitting on % ${NC}" + if [ $LACK_TMOD -eq 1 ]; then + echo "SKIP" + return + fi ifrmmod test_dynamic_debug_submod ifrmmod test_dynamic_debug ddcmd =_ @@ -248,6 +283,14 @@ function test_percent_splitting { function test_mod_submod { echo -e "${GREEN}# TEST_MOD_SUBMOD ${NC}" + if [ $LACK_TMOD -eq 1 ]; then + echo "SKIP" + return + fi + if [ $LACK_TMOD_SUBMOD -eq 1 ]; then + echo "SKIP" + return + fi ifrmmod test_dynamic_debug_submod ifrmmod test_dynamic_debug ddcmd =_
Several tests are dependent upon config choices. Lets avoid failing where that is noise. The KCONFIG_CONFIG var exists to convey the config-file around. If the var names a file, read it and extract the relevant CONFIG items, and use them to skip the dependent tests, thus avoiding the fails that would follow, and the disruption to whatever CI is running these selftests. If the envar doesn't name a config-file, ".config" is assumed. CONFIG_DYNAMIC_DEBUG=y: basic-tests() and comma-terminator-tests() test for the presence of the builtin pr_debugs in module/main.c, which I deemed stable and therefore safe to count. That said, the test fails if only CONFIG_DYNAMIC_DEBUG_CORE=y is set. It could be rewritten to test against test-dynamic-debug.ko, but that just trades one config dependence for another. CONFIG_TEST_DYNAMIC_DEBUG=m As written, test_percent_splitting() modprobes test_dynamic_debug, enables several classes, and count them. It could be re-written to work for the builtin module also, but builtin test modules are not a common or desirable build/config. CONFIG_TEST_DYNAMIC_DEBUG=m && CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m test_mod_submod() recaps the bug found in DRM-CI where drivers werent enabled by drm.debug=<bits>. It modprobes both test_dynamic_debug & test_dynamic_debug_submod, so it depends on a loadable modules config. It could be rewritten to work in a builtin parent config; DRM=y is common enough to be pertinent, but testing that config also wouldn't really test anything more fully than all-loadable modules, since they default together. Signed-off-by: Jim Cromie <jim.cromie@gmail.com> fixup-kconfig --- .../dynamic_debug/dyndbg_selftest.sh | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-)