On Wed, Jul 24, 2019 at 04:06:50PM -0700, Josh Steadmon wrote: > Changes since V2 of this series: > * corrected commit message regarding the different schema variations > * cleaned up the Makefile > * added comment noting that the validator expects JSON-Lines input > * added a --progress flag to the validator > * improved validation error output * replaced underscores with dashes in the command line options to be consistent with the rest of Git: > 2: 3fa4e9eef8 ! 2: 97cb6a3eb4 trace2: add a schema validator for trace2 events > +// Traces can then be verified like so: > +// trace_schema_validator \ > -+// --trace2_event_file /path/to/trace/output \ > -+// --schema_file /path/to/schema > ++// --trace2-event-file /path/to/trace/output \ > ++// --schema-file /path/to/schema > +package main > + > +import ( > @@ t/trace_schema_validator/trace_schema_validator.go (new) > +) > + > +// Required flags > -+var schemaFile = flag.String("schema_file", "", "JSON-Schema filename") > -+var trace2EventFile = flag.String("trace2_event_file", "", "trace2 event filename") > ++var schemaFile = flag.String("schema-file", "", "JSON-Schema filename") > ++var trace2EventFile = flag.String("trace2-event-file", "", "trace2 event filename") > ++var progress = flag.Int("progress", 0, "Print progress message each time we have validated this many lines. --progress=0 means no messages are printed") > 3: acf3aebcaa ! 3: a07458b2e4 ci: run trace2 schema validation in the CI suite > @@ ci/run-build-and-tests.sh: then > make test > + t/trace_schema_validator/trace_schema_validator \ > + --trace2_event_file=${GIT_TRACE2_EVENT} \ > -+ --schema_file=t/trace_schema_validator/strict_schema.json > ++ --schema_file=t/trace_schema_validator/strict_schema.json \ However, the options used in the CI script remained unchanged, and, consequently, the build breaks with the message "flag provided but not defined: -trace2_event_file" (nit: which doesn't begin with the prefix "error:"): https://travis-ci.org/git/git/jobs/563776273#L2238 > ++ --progress=10000 > fi > > check_unignored_build_artifacts > -- > 2.22.0.709.g102302147b-goog >