Skip to content

Commit bcd18f8

Browse files
committed
don't enforce column limit on main
1 parent 0d24701 commit bcd18f8

7 files changed

Lines changed: 13 additions & 106 deletions

File tree

tests/.config/.clang-format

Lines changed: 0 additions & 94 deletions
This file was deleted.

tests/.config/base.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: file:base.clang-format
4+
ColumnLimit: 0
5+
...

tests/.config/dev.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: file:base.clang-format
4+
ColumnLimit: 59
5+
...

tests/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ help:
77
@echo " |"
88
@echo "make grep_clangformat_cppcheck | various greps to catch certain things, clang-format, cppcheck"
99
@echo " |"
10-
@echo "make do_format | format with clang-format"
11-
@echo " |"
1210
@echo "make clangtidy | runs clang-tidy (mainly to verify snake_case)"
1311
@echo " |"
1412
@echo "make build_pdf | build build_pdf.pdf from .tex file"
@@ -32,9 +30,6 @@ compile_clang:
3230
grep_clangformat_cppcheck:
3331
./scripts/grep_clangformat_cppcheck.sh
3432

35-
do_format:
36-
./scripts/do_format.sh
37-
3833
clangtidy:
3934
./scripts/clangtidy.sh
4035

tests/scripts/do_format.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/scripts/grep_clangformat_cppcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ find ../library/ library_checker_aizu_tests/ -name "*[A-Z]*" -or -name "*-*" |
4343
grep --invert-match "README" &&
4444
exit 1
4545

46-
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
46+
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
4747

4848
git submodule init
4949
git submodule update

tests/scripts/update_main.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ done
2525

2626
# the cpp preprocessor sometimes leaves blank empty lines
2727
sed --in-place '/^[[:space:]]*$/d' ../**/*.hpp
28+
2829
# cpp command messes up formatting
29-
make do_format
30+
clang-format-19 -i --style=file:.config/main.clang-format ../**/*.hpp ../**/*.cpp

0 commit comments

Comments
 (0)