From 9005411ce98ee3d6f77c1dbeb76a8b44d25acec5 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Fri, 10 Apr 2026 11:19:37 -0600 Subject: [PATCH 1/6] initial try --- tests/{.config => }/.clang-format | 1 - tests/.config/dev.clang-format | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) rename tests/{.config => }/.clang-format (99%) create mode 100644 tests/.config/dev.clang-format diff --git a/tests/.config/.clang-format b/tests/.clang-format similarity index 99% rename from tests/.config/.clang-format rename to tests/.clang-format index ed27099e2..04d3fe025 100644 --- a/tests/.config/.clang-format +++ b/tests/.clang-format @@ -30,7 +30,6 @@ BreakBeforeTernaryOperators: true BreakConstructorInitializers: AfterColon BreakInheritanceList: AfterColon BreakStringLiterals: false -ColumnLimit: 59 CompactNamespaces: true ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 2 diff --git a/tests/.config/dev.clang-format b/tests/.config/dev.clang-format new file mode 100644 index 000000000..41e7d221c --- /dev/null +++ b/tests/.config/dev.clang-format @@ -0,0 +1,2 @@ +BasedOnStyle: InheritParentConfig +ColumnLimit: 59 From de62bcdc14c2fef8224223122e48ab9dbf668bc5 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Fri, 10 Apr 2026 11:21:10 -0600 Subject: [PATCH 2/6] actually trying this --- tests/{ => .config}/.clang-format | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{ => .config}/.clang-format (100%) diff --git a/tests/.clang-format b/tests/.config/.clang-format similarity index 100% rename from tests/.clang-format rename to tests/.config/.clang-format From d15dcbaa9d3c52e6d95455cd0d13905b0a6549eb Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Fri, 10 Apr 2026 11:33:11 -0600 Subject: [PATCH 3/6] fix --- tests/.config/dev.clang-format | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.config/dev.clang-format b/tests/.config/dev.clang-format index 41e7d221c..a434d4104 100644 --- a/tests/.config/dev.clang-format +++ b/tests/.config/dev.clang-format @@ -1,2 +1,3 @@ BasedOnStyle: InheritParentConfig ColumnLimit: 59 +AlignAfterOpenBracket: DontAlign From 198e29d257f9e3db896607839782c109725b403d Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Fri, 10 Apr 2026 11:33:39 -0600 Subject: [PATCH 4/6] fix --- tests/.config/.clang-format | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/.config/.clang-format b/tests/.config/.clang-format index 04d3fe025..07275e097 100644 --- a/tests/.config/.clang-format +++ b/tests/.config/.clang-format @@ -2,7 +2,6 @@ Language: Cpp BasedOnStyle: Google AccessModifierOffset: -2 -AlignAfterOpenBracket: DontAlign AlignConsecutiveAssignments: false AlignConsecutiveBitFields: None AlignConsecutiveDeclarations: None From e7d5df2253ba5fb146f6c75aa6612f1e5e65a808 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Fri, 10 Apr 2026 11:36:11 -0600 Subject: [PATCH 5/6] updates --- tests/.config/main.clang-format | 3 +++ tests/Makefile | 5 ----- tests/scripts/do_format.sh | 5 ----- tests/scripts/grep_clangformat_cppcheck.sh | 2 +- tests/scripts/update_main.sh | 3 ++- 5 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 tests/.config/main.clang-format delete mode 100755 tests/scripts/do_format.sh diff --git a/tests/.config/main.clang-format b/tests/.config/main.clang-format new file mode 100644 index 000000000..1cd4207cf --- /dev/null +++ b/tests/.config/main.clang-format @@ -0,0 +1,3 @@ +BasedOnStyle: InheritParentConfig +ColumnLimit: 0 +AlignAfterOpenBracket: DontAlign diff --git a/tests/Makefile b/tests/Makefile index 41fcb579a..a83429382 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -7,8 +7,6 @@ help: @echo " |" @echo "make grep_clangformat_cppcheck | various greps to catch certain things, clang-format, cppcheck" @echo " |" - @echo "make do_format | format with clang-format" - @echo " |" @echo "make clangtidy | runs clang-tidy (mainly to verify snake_case)" @echo " |" @echo "make build_pdf | build build_pdf.pdf from .tex file" @@ -32,9 +30,6 @@ compile_clang: grep_clangformat_cppcheck: ./scripts/grep_clangformat_cppcheck.sh -do_format: - ./scripts/do_format.sh - clangtidy: ./scripts/clangtidy.sh diff --git a/tests/scripts/do_format.sh b/tests/scripts/do_format.sh deleted file mode 100755 index 7a41729a2..000000000 --- a/tests/scripts/do_format.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# ** glob now searches any number of levels -shopt -s globstar - -clang-format-19 -i --style=file:.config/.clang-format ../**/*.hpp ../**/*.cpp diff --git a/tests/scripts/grep_clangformat_cppcheck.sh b/tests/scripts/grep_clangformat_cppcheck.sh index 9c39c6d74..8c2b4851f 100755 --- a/tests/scripts/grep_clangformat_cppcheck.sh +++ b/tests/scripts/grep_clangformat_cppcheck.sh @@ -43,7 +43,7 @@ find ../library/ library_checker_aizu_tests/ -name "*[A-Z]*" -or -name "*-*" | grep --invert-match "README" && exit 1 -clang-format-19 --dry-run --Werror --style=file:.config/.clang-format library_checker_aizu_tests/**/*.hpp library_checker_aizu_tests/**/*.test.cpp ../library/**/*.hpp ../library/**/*.cpp || exit 1 +clang-format-19 --dry-run --Werror --style=file:.config/dev.clang-format library_checker_aizu_tests/**/*.hpp library_checker_aizu_tests/**/*.test.cpp ../library/**/*.hpp ../library/**/*.cpp || exit 1 git submodule init git submodule update diff --git a/tests/scripts/update_main.sh b/tests/scripts/update_main.sh index fdaae0ba8..a43f1637a 100755 --- a/tests/scripts/update_main.sh +++ b/tests/scripts/update_main.sh @@ -25,5 +25,6 @@ done # the cpp preprocessor sometimes leaves blank empty lines sed --in-place '/^[[:space:]]*$/d' ../**/*.hpp + # cpp command messes up formatting -make do_format +clang-format-19 -i --style=file:.config/main.clang-format ../**/*.hpp ../**/*.cpp From 13d1f16b067cad84b71d33327f0b73579d25e615 Mon Sep 17 00:00:00 2001 From: Luke Videckis Date: Fri, 10 Apr 2026 14:15:01 -0600 Subject: [PATCH 6/6] update --- tests/.config/main.clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/.config/main.clang-format b/tests/.config/main.clang-format index 1cd4207cf..3640ab909 100644 --- a/tests/.config/main.clang-format +++ b/tests/.config/main.clang-format @@ -1,3 +1,3 @@ BasedOnStyle: InheritParentConfig -ColumnLimit: 0 +ColumnLimit: 1000 AlignAfterOpenBracket: DontAlign