diff options
author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 23:54:36 +0000 |
---|---|---|
committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 23:54:36 +0000 |
commit | b3a259b88b030ec2786bd13a7dc79a951d7e4fb7 (patch) | |
tree | 9871690a7199485e5dac1e5067cf45d05e8ba2cb /tools/checkdeps | |
parent | 613eef6fa590053eba18074aef8b2e25e9b6ded9 (diff) | |
download | chromium_src-b3a259b88b030ec2786bd13a7dc79a951d7e4fb7.zip chromium_src-b3a259b88b030ec2786bd13a7dc79a951d7e4fb7.tar.gz chromium_src-b3a259b88b030ec2786bd13a7dc79a951d7e4fb7.tar.bz2 |
Commit these files in advance of tests so that they pass on their CQ run.
It appears that, while checkdeps_test is run on the CQ, the new files are not actually source-controlled. Since the checkdeps tests expect them to be, they fail.
Commit the data files first, and then later commit the tests that run against them.
TBR=joi@chromium.org
BUG=155596
Review URL: https://chromiumcodereview.appspot.com/11363174
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checkdeps')
10 files changed, 71 insertions, 0 deletions
diff --git a/tools/checkdeps/testdata/DEPS b/tools/checkdeps/testdata/DEPS index 8cb5054..f0657f5 100644 --- a/tools/checkdeps/testdata/DEPS +++ b/tools/checkdeps/testdata/DEPS @@ -3,3 +3,6 @@ include_rules = [ "+tools/checkdeps/testdata/allowed", "-third_party/explicitly_disallowed", ] +skip_child_includes = [ + "checkdeps_test", +] diff --git a/tools/checkdeps/testdata/checkdeps_test/DEPS b/tools/checkdeps/testdata/checkdeps_test/DEPS new file mode 100644 index 0000000..91a9b99 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/DEPS @@ -0,0 +1,5 @@ +include_rules = [ + "-disallowed", + "+allowed", + "-third_party/explicitly_disallowed", +] diff --git a/tools/checkdeps/testdata/checkdeps_test/allowed/DEPS b/tools/checkdeps/testdata/checkdeps_test/allowed/DEPS new file mode 100644 index 0000000..14aa4d4 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/allowed/DEPS @@ -0,0 +1,11 @@ +include_rules = [ + "+disallowed/allowed", + "!disallowed/temporarily_allowed.h", + "+third_party/allowed_may_use", +] + +specific_include_rules = { + ".*_unittest\.cc": [ + "+disallowed/teststuff", + ] +} diff --git a/tools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc b/tools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc new file mode 100644 index 0000000..1a507ec --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/allowed/foo_unittest.cc @@ -0,0 +1,5 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "disallowed/teststuff/good.h" diff --git a/tools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc b/tools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc new file mode 100644 index 0000000..4278d64 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/allowed/not_a_test.cc @@ -0,0 +1,5 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "disallowed/teststuff/bad.h" diff --git a/tools/checkdeps/testdata/checkdeps_test/allowed/test.h b/tools/checkdeps/testdata/checkdeps_test/allowed/test.h new file mode 100644 index 0000000..2dbd7a3 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/allowed/test.h @@ -0,0 +1,11 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "allowed/good.h" +#include "disallowed/bad.h" +#include "disallowed/allowed/good.h" +#include "disallowed/temporarily_allowed.h" +#include "third_party/explicitly_disallowed/bad.h" +#include "third_party/allowed_may_use/good.h" +#include "third_party/no_rule/bad.h" diff --git a/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/DEPS b/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/DEPS new file mode 100644 index 0000000..2be72b8 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/DEPS @@ -0,0 +1,3 @@ +skip_child_includes = [ + "skipped", +] diff --git a/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h b/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h new file mode 100644 index 0000000..8010596 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/skipped/test.h @@ -0,0 +1,5 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "whatever/whocares/ok.h" diff --git a/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h b/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h new file mode 100644 index 0000000..aa5013d --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/disallowed/allowed/test.h @@ -0,0 +1,11 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "allowed/good.h" +// Always allowed to include self and parents. +#include "disallowed/good.h" +#include "disallowed/allowed/good.h" +#include "third_party/explicitly_disallowed/bad.h" +#include "third_party/allowed_may_use/bad.h" +#include "third_party/no_rule/bad.h" diff --git a/tools/checkdeps/testdata/checkdeps_test/disallowed/test.h b/tools/checkdeps/testdata/checkdeps_test/disallowed/test.h new file mode 100644 index 0000000..5520a68 --- /dev/null +++ b/tools/checkdeps/testdata/checkdeps_test/disallowed/test.h @@ -0,0 +1,12 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "allowed/good.h" +// Always allowed to include self. +#include "disallowed/good.h" +#include "disallowed/allowed/good.h" +#include "third_party/explicitly_disallowed/bad.h" +// Only allowed for code under allowed/. +#include "third_party/allowed_may_use/bad.h" +#include "third_party/no_rule/bad.h" |