@@ -390,14 +390,29 @@ def test_skbuild_settings_pyproject_toml_broken(
390390
391391 ex = capsys .readouterr ().out
392392 ex = re .sub (r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))" , "" , ex )
393- assert (
394- ex .split ()
395- == """\
396- ERROR: Unrecognized options in pyproject.toml:
397- tool.scikit-build.cmake.verison -> Did you mean: tool.scikit-build.cmake.version, tool.scikit-build.cmake.verbose, tool.scikit-build.cmake.define?
398- tool.scikit-build.logger -> Did you mean: tool.scikit-build.logging, tool.scikit-build.generate, tool.scikit-build.search?
399- """ .split ()
400- )
393+ assert ex .split () == [
394+ "ERROR:" ,
395+ "Unrecognized" ,
396+ "options" ,
397+ "in" ,
398+ "pyproject.toml:" ,
399+ "tool.scikit-build.cmake.verison" ,
400+ "->" ,
401+ "Did" ,
402+ "you" ,
403+ "mean:" ,
404+ "tool.scikit-build.cmake.version," ,
405+ "tool.scikit-build.cmake.verbose," ,
406+ "tool.scikit-build.cmake.define?" ,
407+ "tool.scikit-build.logger" ,
408+ "->" ,
409+ "Did" ,
410+ "you" ,
411+ "mean:" ,
412+ "tool.scikit-build.logging," ,
413+ "tool.scikit-build.generate," ,
414+ "tool.scikit-build.search?" ,
415+ ]
401416
402417
403418def test_skbuild_settings_pyproject_conf_broken (
@@ -430,14 +445,27 @@ def test_skbuild_settings_pyproject_conf_broken(
430445 ex = capsys .readouterr ().out
431446 # Filter terminal color codes
432447 ex = re .sub (r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))" , "" , ex )
433- assert (
434- ex .split ()
435- == """\
436- ERROR: Unrecognized options in config-settings:
437- cmake.verison -> Did you mean: cmake.version, cmake.verbose, cmake.define?
438- logger -> Did you mean: logging?
439- """ .split ()
440- )
448+ assert ex .split () == [
449+ "ERROR:" ,
450+ "Unrecognized" ,
451+ "options" ,
452+ "in" ,
453+ "config-settings:" ,
454+ "cmake.verison" ,
455+ "->" ,
456+ "Did" ,
457+ "you" ,
458+ "mean:" ,
459+ "cmake.version," ,
460+ "cmake.verbose," ,
461+ "cmake.define?" ,
462+ "logger" ,
463+ "->" ,
464+ "Did" ,
465+ "you" ,
466+ "mean:" ,
467+ "logging?" ,
468+ ]
441469
442470
443471def test_skbuild_settings_min_version_defaults_strip (
@@ -742,13 +770,33 @@ def test_skbuild_settings_auto_cmake_warning(
742770 ex = capsys .readouterr ().out
743771 ex = re .sub (r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))" , "" , ex )
744772 print (ex )
745- assert (
746- ex .split ()
747- == """\
748- WARNING: CMakeLists.txt not found when looking for minimum CMake version.
749- Report this or (and) set manually to avoid this warning. Using 3.15 as a fall-back.
750- """ .split ()
751- )
773+ assert ex .split () == [
774+ "WARNING:" ,
775+ "CMakeLists.txt" ,
776+ "not" ,
777+ "found" ,
778+ "when" ,
779+ "looking" ,
780+ "for" ,
781+ "minimum" ,
782+ "CMake" ,
783+ "version." ,
784+ "Report" ,
785+ "this" ,
786+ "or" ,
787+ "(and)" ,
788+ "set" ,
789+ "manually" ,
790+ "to" ,
791+ "avoid" ,
792+ "this" ,
793+ "warning." ,
794+ "Using" ,
795+ "3.15" ,
796+ "as" ,
797+ "a" ,
798+ "fall-back." ,
799+ ]
752800
753801
754802def test_skbuild_settings_cmake_define_list ():
0 commit comments