• Vitor Massaru Iha's avatar
    kunit: Fix TabError, remove defconfig code and handle when there is no kunitconfig · 01397e82
    Vitor Massaru Iha authored
    The identation before this code
    (`if not os.path.exists(cli_args.build_dir):``)
    was with spaces instead of tabs after fixed up merge conflits,
    this commit revert spaces to tabs:
    
    [iha@bbking linux]$ tools/testing/kunit/kunit.py run
      File "tools/testing/kunit/kunit.py", line 247
        if not linux:
                    ^
    TabError: inconsistent use of tabs and spaces in indentation
    
    [iha@bbking linux]$ tools/testing/kunit/kunit.py run
    Traceback (most recent call last):
      File "tools/testing/kunit/kunit.py", line 338, in <module>
        main(sys.argv[1:])
      File "tools/testing/kunit/kunit.py", line 215, in main
        add_config_opts(config_parser)
    
    [iha@bbking linux]$ tools/testing/kunit/kunit.py run
    Traceback (most recent call last):
      File "tools/testing/kunit/kunit.py", line 337, in <module>
        main(sys.argv[1:])
      File "tools/testing/kunit/kunit.py", line 255, in main
        result = run_tests(linux, request)
      File "tools/testing/kunit/kunit.py", line 133, in run_tests
        request.defconfig,
    AttributeError: 'KunitRequest' object has no attribute 'defconfig'
    
    Handles when there is no .kunitconfig, the error due to merge conflicts
    between the following:
    
    commit 9bdf64b3 ("kunit: use KUnit defconfig by default")
    commit 45ba7a89 ("kunit: kunit_tool: Separate out
    	config/build/exec/parse")
    
    [iha@bbking linux]$ tools/testing/kunit/kunit.py run
    Traceback (most recent call last):
      File "tools/testing/kunit/kunit.py", line 335, in <module>
        main(sys.argv[1:])
      File "tools/testing/kunit/kunit.py", line 246, in main
        linux = kunit_kernel.LinuxSourceTree()
      File "../tools/testing/kunit/kunit_kernel.py", line 109, in __init__
        self._kconfig.read_from_file(kunitconfig_path)
      File "t../ools/testing/kunit/kunit_config.py", line 88, in read_from_file
        with open(path, 'r') as f:
    FileNotFoundError: [Errno 2] No such file or directory: '.kunit/.kunitconfig'
    Signed-off-by: default avatarVitor Massaru Iha <vitor@massaru.org>
    Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
    01397e82
kunit.py 10.7 KB