aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
diff options
context:
space:
mode:
authorGravatar Nathan Harmata <nharmata@google.com>2016-08-17 18:10:35 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2016-08-18 08:30:46 +0000
commitbb5d5efb4b50710241b5b374eb67084f4bf08278 (patch)
treec8e3dfc3d146cec4cce103f95803ba2902d08cbb /src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
parent823f72f7f978267414f6b59d24210c9743ba6b13 (diff)
RELNOTES: The string list returned by the skylark 'glob' function is now sorted. Previously, it would return a list formed by concatenating the sorted results of each pattern in the 'includes' list.
A bunch of cleanups and one bug fix: -Remove the unused-except-for tests GlobCache#globsUpToDate. This code has been dead for a very very long time, ever since we switched to using Skyframe. -Change the semantics of the 'glob' function as described above. -Change UnixGlob to return unsorted results. Document this in UnixGlob and GlobCache. -Change LegacyGlobber to conditionally return sorted results. Have users other than PackageFunction get sorted results (as described above). Have PackageFunction's use case get completely unsorted results, and have PackageFunction do the sorting itself. -Have PackageFunction's HybridGlobber unconditionally sort the glob result list. This ensure deterministic glob results, fixing a bug where the order of the elements of the result depended on the contents of the Skyframe graph, which of course depends on the sequence of incremental Blaze commands. -- MOS_MIGRATED_REVID=130540152
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index b3740c8f8c..e53690e20c 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -121,7 +121,7 @@ public class PackageFactoryApparatus {
getPackageLocator(),
null,
TestUtils.getPool());
- LegacyGlobber globber = new LegacyGlobber(globCache);
+ LegacyGlobber globber = PackageFactory.createLegacyGlobber(globCache);
Package externalPkg =
factory.newExternalPackageBuilder(
buildFile.getParentDirectory().getRelative("WORKSPACE"), "TESTING")