Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/.config/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Language: Cpp
BasedOnStyle: Google
AccessModifierOffset: -2
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
Expand Down Expand Up @@ -30,7 +29,6 @@ BreakBeforeTernaryOperators: true
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
BreakStringLiterals: false
ColumnLimit: 59
CompactNamespaces: true
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 2
Expand Down
3 changes: 3 additions & 0 deletions tests/.config/dev.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
BasedOnStyle: InheritParentConfig
ColumnLimit: 59
AlignAfterOpenBracket: DontAlign
3 changes: 3 additions & 0 deletions tests/.config/main.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
BasedOnStyle: InheritParentConfig
ColumnLimit: 1000
AlignAfterOpenBracket: DontAlign
5 changes: 0 additions & 5 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -32,9 +30,6 @@ compile_clang:
grep_clangformat_cppcheck:
./scripts/grep_clangformat_cppcheck.sh

do_format:
./scripts/do_format.sh

clangtidy:
./scripts/clangtidy.sh

Expand Down
5 changes: 0 additions & 5 deletions tests/scripts/do_format.sh

This file was deleted.

2 changes: 1 addition & 1 deletion tests/scripts/grep_clangformat_cppcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/scripts/update_main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading