aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-01 13:21:35 -0800
committerColin Cross <ccross@android.com>2017-02-02 16:48:06 -0800
commitb519a7e1b69b6b658d8a0b7171323ffc03965ded (patch)
tree20db4d2e796137460ac4b815e49c05d171c9cac7 /tests
parent2eeb7ee14b6d8e1ec497cfa514cf22c1b4772c39 (diff)
downloadplatform_build_blueprint-b519a7e1b69b6b658d8a0b7171323ffc03965ded.tar.gz
platform_build_blueprint-b519a7e1b69b6b658d8a0b7171323ffc03965ded.tar.bz2
platform_build_blueprint-b519a7e1b69b6b658d8a0b7171323ffc03965ded.zip
Add globbing to filesystem mocking
Add globbing to filesystem mocking so that more code can be tested against the mock. Also moves the filesystem mock to pathtools, and renames pathtools.GlobWithExcludes to pathtools.Glob, replacing the existing pathtools.Glob. Test: blueprint tests Change-Id: I722df8121bc870c4a861d7c249245c57dcb607be
Diffstat (limited to 'tests')
-rw-r--r--tests/test_tree/build.ninja.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_tree/build.ninja.in b/tests/test_tree/build.ninja.in
index 5604b40..7728ca3 100644
--- a/tests/test_tree/build.ninja.in
+++ b/tests/test_tree/build.ninja.in
@@ -58,7 +58,6 @@ rule g.bootstrap.link
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
: g.bootstrap.compile ${g.bootstrap.srcDir}/blueprint/context.go $
- ${g.bootstrap.srcDir}/blueprint/fs.go $
${g.bootstrap.srcDir}/blueprint/glob.go $
${g.bootstrap.srcDir}/blueprint/live_tracker.go $
${g.bootstrap.srcDir}/blueprint/mangle.go $
@@ -135,7 +134,7 @@ default $
# Variant:
# Type: bootstrap_go_package
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModuleFactory.func1
-# Defined: blueprint/Blueprints:50:1
+# Defined: blueprint/Blueprints:49:1
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
@@ -151,7 +150,7 @@ default $
# Variant:
# Type: bootstrap_go_package
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModuleFactory.func1
-# Defined: blueprint/Blueprints:34:1
+# Defined: blueprint/Blueprints:33:1
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
@@ -170,12 +169,13 @@ default $
# Variant:
# Type: bootstrap_go_package
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModuleFactory.func1
-# Defined: blueprint/Blueprints:56:1
+# Defined: blueprint/Blueprints:55:1
build $
${g.bootstrap.buildDir}/.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
: g.bootstrap.compile $
${g.bootstrap.srcDir}/blueprint/pathtools/lists.go $
+ ${g.bootstrap.srcDir}/blueprint/pathtools/fs.go $
${g.bootstrap.srcDir}/blueprint/pathtools/glob.go | $
${g.bootstrap.compileCmd} $
${g.bootstrap.buildDir}/.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a