reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-26 21:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile: enforce formatting of sys files in presubmit

Browse Source
This commit is contained in:
Dmitry Vyukov 2017-08-18 11:14:20 +02:00
parent 5b461e7ecd
commit 41bbf437e1
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -10,6 +10,7 @@ endif
manager fuzzer executor \ manager fuzzer executor \
ci hub \ ci hub \
execprog mutate prog2c stress repro upgrade db \ execprog mutate prog2c stress repro upgrade db \
bin/syz-sysgen bin/syz-extract bin/syz-fmt \
extract generate \ extract generate \
android \ android \
format tidy test arch presubmit clean format tidy test arch presubmit clean
@ -81,9 +82,12 @@ generate: bin/syz-sysgen
bin/syz-sysgen: bin/syz-sysgen:
go build $(GOFLAGS) -o $@ ./sys/syz-sysgen go build $(GOFLAGS) -o $@ ./sys/syz-sysgen
format: format: bin/syz-fmt
go fmt ./... go fmt ./...
clang-format --style=file -i executor/*.cc executor/*.h tools/kcovtrace/*.c clang-format --style=file -i executor/*.cc executor/*.h tools/kcovtrace/*.c
bin/syz-fmt sys
bin/syz-fmt:
go build $(GOFLAGS) -o $@ ./tools/syz-fmt
tidy: tidy:
# A single check is enabled for now. But it's always fixable and proved to be useful. # A single check is enabled for now. But it's always fixable and proved to be useful.

10
pkg/ast/parser_test.go
View File

@ -42,12 +42,10 @@ func TestParseAll(t *testing.T) {
if len(top) != len(top2) { if len(top) != len(top2) {
t.Fatalf("formatting number of top level decls: %v/%v", len(top), len(top2)) t.Fatalf("formatting number of top level decls: %v/%v", len(top), len(top2))
} }
if false { // While sys files are not formatted, formatting in fact changes it.
// While sys files are not formatted, formatting in fact changes it. for i := range top {
for i := range top { if !reflect.DeepEqual(top[i], top2[i]) {
if !reflect.DeepEqual(top[i], top2[i]) { t.Fatalf("formatting changed code:\n%#v\nvs:\n%#v", top[i], top2[i])
t.Fatalf("formatting changed code:\n%#v\nvs:\n%#v", top[i], top2[i])
}
} }
} }
} }

1
tools/syz-fmt/syz-fmt.go
View File

@ -61,6 +61,7 @@ func processFile(file string, mode os.FileMode) {
if bytes.Equal(data, formatted) { if bytes.Equal(data, formatted) {
return return
} }
fmt.Printf("reformatting %v\n", file)
if err := os.Rename(file, file+"~"); err != nil { if err := os.Rename(file, file+"~"); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)