Skip to content

Free, open-source 3D sculpting for Linux, macOS and Windows: dense meshes, remeshing, painting, built-in AI (image/text to 3D), Send to Unreal, game-ready LODs, Gaussian splats and OpenUSD.

Marks checks: a tree without .git reports skipped, not passed

islandmed3f5dee678b80
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1ae6aef..9d165731 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -810,6 +810,8 @@ if(SCULPTFORGE_BUILD_TESTS)
# without its committed cache entry fails here too, not only in CI (0.11.12 staging).
add_test(NAME marks_media COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/check_marks_media.py --cached-only
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ # Without .git (the PC's shipped tree) both report "skipped", not "passed"; t0.sh runs marks locally first.
+ set_tests_properties(marks marks_media PROPERTIES SKIP_RETURN_CODE 77)
add_test(NAME marks_media_self_test COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/check_marks_media.py --self-test)
add_test(NAME media_takedown_self_test COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/media_takedown.py --self-test)
# The public gallery repository matches tools/brush-gallery/repo (the live compare is in release.sh: network).
diff --git a/tools/check_marks.py b/tools/check_marks.py
index 8a43de99..a35bf2bd 100644
--- a/tools/check_marks.py
+++ b/tools/check_marks.py
@@ -28,6 +28,7 @@ SEPARATOR = r"(?:[ \t]+|[-_.])" # what a space in a pattern stands for
# Binary files of SculptForge's own formats, read as their printable strings (zip archives are read whatever the name).
OWN_BINARY = (".sfproj", ".sfbrush", ".sfmaterial", ".sfpack", ".sfmacro", ".bridge", ".z", ".bin", ".json")
MIN_STRING = 4 # shortest printable run read from a binary file
+SKIPPED = 77 # exit code when git can't list the files (ctest SKIP_RETURN_CODE: reported as skipped, not passed)
def load_marks(text=None):
@@ -243,8 +244,10 @@ def main(argv):
return 0
mark_re = load_marks()
if tracked_files() is None:
+ # A tree without .git (pc.sh ships a tarball) is "not checked", never "clean" (11-07: the PC's marks test
+ # passed in 0.04 s on a branch with a mark in a comment).
print("check_marks: skipped, git can't list the tracked files here")
- return 0
+ return SKIPPED
if "--count" in argv:
count(mark_re)
return 0
diff --git a/tools/check_marks_media.py b/tools/check_marks_media.py
index 7cda4873..f8da1b1e 100644
--- a/tools/check_marks_media.py
+++ b/tools/check_marks_media.py
@@ -148,7 +148,7 @@ def main(argv):
cache = {} if explicit else load_cache() # named files are read afresh, so their words can be shown
if not explicit and check_marks.tracked_files() is None:
print("check_marks_media: skipped, git can't list the tracked files here")
- return 0
+ return check_marks.SKIPPED
paths = explicit or media_files()
keys = {p: sha(ROOT / p if not explicit else p) for p in paths}
todo = [p for p in paths if keys[p] not in cache]