From 1ce5bd8e84085a3f89017d71442c75fd4a8dc9f6 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Fri, 29 Apr 2016 09:39:26 -0700 Subject: Updates for PR comments. --- benchmarks/Makefile.am | 3 ++- benchmarks/benchmarks.proto | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 79581ee9..f0ed4899 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -27,8 +27,9 @@ nodist_generate_datasets_SOURCES = \ $(benchmarks_protoc_outputs) \ $(benchmarks_protoc_outputs_proto2) -# Explicit deps beacuse BUILT_SOURCES are only done before a "make all/check" +# Explicit deps because BUILT_SOURCES are only done before a "make all/check" # so a direct "make test_cpp" could fail if parallel enough. +# See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually generate_datasets-generate_datasets.$(OBJEXT): benchmarks.pb.h google_message1.h google_message2.h $(benchmarks_protoc_outputs): protoc_middleman diff --git a/benchmarks/benchmarks.proto b/benchmarks/benchmarks.proto index 5c2706df..0ac3bf33 100644 --- a/benchmarks/benchmarks.proto +++ b/benchmarks/benchmarks.proto @@ -68,16 +68,16 @@ message Metric { // A unique ID for these results. Used for de-duping. string guid = 1; - // The tags specify exactly what benchmark was run against the dataset. + // The labels specify exactly what benchmark was run against the dataset. // The specific benchmark suite can decide what these mean, but here are - // some common tags that have a predefined meaning: + // some common labels that have a predefined meaning: // // - "dataset": for tests that pertain to a specific dataset. // // For example: // // # Tests parsing from binary proto string using arenas. - // tags={ + // labels={ // dataset: "testalltypes", // op: "parse", // format: "binaryproto", @@ -86,7 +86,7 @@ message Metric { // } // // # Tests serializing to JSON string. - // tags={ + // labels={ // dataset: "testalltypes", // op: "serialize", // format: "json", -- cgit v1.2.3