Remove suppression of build/include_subdir cpplint check.

google · Jan 13, 2017 · a582efd · a582efd
1 parent 886d543
commit a582efd
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ install:
   - cd -
 
 before_script:
-  - travis_retry wget --quiet -O - https://raw.githubusercontent.com/cpplint/cpplint/master/cpplint.py | python - --root=src --recursive --filter=-build/include_subdir src examples
+  - travis_retry wget --quiet -O - https://raw.githubusercontent.com/cpplint/cpplint/master/cpplint.py | python - --recursive src examples
   - mkdir -p build && cd build
   - cmake .. -GNinja -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
 

diff --git a/src/field_instance.h b/src/field_instance.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIELD_INSTANCE_H_
-#define FIELD_INSTANCE_H_
+#ifndef SRC_FIELD_INSTANCE_H_
+#define SRC_FIELD_INSTANCE_H_
 
 #include <memory>
 #include <string>
@@ -382,4 +382,4 @@ class FieldInstance {
 
 }  // namespace protobuf_mutator
 
-#endif  // FIELD_INSTANCE_H_
+#endif  // SRC_FIELD_INSTANCE_H_
diff --git a/src/libfuzzer_example.cc b/src/libfuzzer_example.cc
@@ -16,8 +16,8 @@
 #include <cstdint>
 
 #include "google/protobuf/text_format.h"
-#include "libfuzzer_example.pb.h"
-#include "libfuzzer_protobuf_mutator.h"
+#include "src/libfuzzer_example.pb.h"
+#include "src/libfuzzer_protobuf_mutator.h"
 
 using google::protobuf::Message;
 using google::protobuf::TextFormat;

diff --git a/src/libfuzzer_protobuf_mutator.cc b/src/libfuzzer_protobuf_mutator.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "libfuzzer_protobuf_mutator.h"
+#include "src/libfuzzer_protobuf_mutator.h"
 
 #include <string.h>
 #include <cassert>

diff --git a/src/libfuzzer_protobuf_mutator.h b/src/libfuzzer_protobuf_mutator.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef LIBFUZZER_PROTOBUF_MUTATOR_H_
-#define LIBFUZZER_PROTOBUF_MUTATOR_H_
+#ifndef SRC_LIBFUZZER_PROTOBUF_MUTATOR_H_
+#define SRC_LIBFUZZER_PROTOBUF_MUTATOR_H_
 
 #include <string>
 
-#include "protobuf_mutator.h"
+#include "src/protobuf_mutator.h"
 
 namespace protobuf_mutator {
 
@@ -43,4 +43,4 @@ class LibFuzzerProtobufMutator : public ProtobufMutator {
 
 }  // namespace protobuf_mutator
 
-#endif  // LIBFUZZER_PROTOBUF_MUTATOR_H_
+#endif  // SRC_LIBFUZZER_PROTOBUF_MUTATOR_H_
diff --git a/src/protobuf_mutator.cc b/src/protobuf_mutator.cc
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "protobuf_mutator.h"
+#include "src/protobuf_mutator.h"
 
 #include <algorithm>
 #include <iostream>
 #include <map>
 #include <random>
 #include <string>
 
-#include "field_instance.h"
 #include "google/protobuf/message.h"
-#include "weighted_reservoir_sampler.h"
+#include "src/field_instance.h"
+#include "src/weighted_reservoir_sampler.h"
 
 using google::protobuf::Descriptor;
 using google::protobuf::EnumDescriptor;

diff --git a/src/protobuf_mutator.h b/src/protobuf_mutator.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PROTOBUF_MUTATOR_H_
-#define PROTOBUF_MUTATOR_H_
+#ifndef SRC_PROTOBUF_MUTATOR_H_
+#define SRC_PROTOBUF_MUTATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -89,4 +89,4 @@ class ProtobufMutator {
 
 }  // namespace protobuf_mutator
 
-#endif  // PROTOBUF_MUTATOR_H_
+#endif  // SRC_PROTOBUF_MUTATOR_H_
diff --git a/src/protobuf_mutator_test.cc b/src/protobuf_mutator_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "protobuf_mutator.h"
+#include "src/protobuf_mutator.h"
 
 #include <algorithm>
 #include <set>
@@ -23,8 +23,7 @@
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/util/message_differencer.h"
 #include "gtest/gtest.h"
-
-#include "protobuf_mutator.pb.h"
+#include "src/protobuf_mutator.pb.h"
 
 using google::protobuf::TextFormat;
 using google::protobuf::util::MessageDifferencer;

diff --git a/src/weighted_reservoir_sampler.h b/src/weighted_reservoir_sampler.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef WEIGHTED_RESERVOIR_SAMPLER_H_
-#define WEIGHTED_RESERVOIR_SAMPLER_H_
+#ifndef SRC_WEIGHTED_RESERVOIR_SAMPLER_H_
+#define SRC_WEIGHTED_RESERVOIR_SAMPLER_H_
 
 #include <cassert>
 #include <random>
@@ -57,4 +57,4 @@ class WeightedReservoirSampler {
 
 }  // namespace protobuf_mutator
 
-#endif  // WEIGHTED_RESERVOIR_SAMPLER_H_
+#endif  // SRC_WEIGHTED_RESERVOIR_SAMPLER_H_
diff --git a/src/weighted_reservoir_sampler_test.cc b/src/weighted_reservoir_sampler_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "weighted_reservoir_sampler.h"
+#include "src/weighted_reservoir_sampler.h"
 
 #include <tuple>
 #include <vector>