From e1c33698e6919f569c30774a1c83d8c464d59d7e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Feb 2022 12:30:58 +1100 Subject: GNUmakefile: prefer "check_" prefix instead of "test_" - Reserve "test" for tests & testing frameworks. - Add "check_mypy" to "make help" text. - Output to the standard output instead of redirecting to log-files, leave redirecting output log-files to the user running the command. --- GNUmakefile | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index c08bde5c474..a410662647e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -51,12 +51,6 @@ Testing Targets * test: Run automated tests with ctest. - * test_cmake: - Runs our own cmake file checker - which detects errors in the cmake file list definitions - * test_pep8: - Checks all python script are pep8 - which are tagged to use the stricter formatting Static Source Code Checking Not associated with building Blender. @@ -72,6 +66,10 @@ Static Source Code Checking using one of the accepted licenses in 'doc/license/SPDX-license-identifiers.txt' Append with 'SHOW_HEADERS=1' to show all unique headers which can be useful for spotting license irregularities. + * check_cmake: Runs our own cmake file checker which detects errors in the cmake file list definitions. + * check_pep8: Checks all Python script are pep8 which are tagged to use the stricter formatting. + * check_mypy: Checks all Python scripts using mypy, + see: source/tools/check_source/check_mypy_config.py scripts which are included. Spell Checkers This runs the spell checker from the developer tools repositor. @@ -399,16 +397,6 @@ package_archive: .FORCE test: .FORCE @$(PYTHON) ./build_files/utils/make_test.py "$(BUILD_DIR)" -# run pep8 check check on scripts we distribute. -test_pep8: .FORCE - @$(PYTHON) tests/python/pep8.py > test_pep8.log 2>&1 - @echo "written: test_pep8.log" - -# run some checks on our CMAKE files. -test_cmake: .FORCE - @$(PYTHON) build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1 - @echo "written: test_cmake_consistency.log" - # ----------------------------------------------------------------------------- # Project Files @@ -486,7 +474,6 @@ check_descriptions: .FORCE @$(BLENDER_BIN) --background -noaudio --factory-startup --python \ "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py" -# run deprecation tests, see if we have anything to remove. check_deprecated: .FORCE @PYTHONIOENCODING=utf_8 $(PYTHON) \ source/tools/check_source/check_deprecated.py @@ -496,6 +483,14 @@ check_licenses: .FORCE "$(BLENDER_DIR)/source/tools/check_source/check_licenses.py" \ "--show-headers=$(SHOW_HEADERS)" +check_pep8: .FORCE + @PYTHONIOENCODING=utf_8 $(PYTHON) \ + tests/python/pep8.py + +check_cmake: .FORCE + @PYTHONIOENCODING=utf_8 $(PYTHON) \ + build_files/cmake/cmake_consistency_check.py + # ----------------------------------------------------------------------------- # Utilities -- cgit v1.2.3