mirror of https://github.com/sbt/sbt.git
fix forward aggregation enabled check
This commit is contained in:
parent
5e155900da
commit
7e71ab7c3d
|
|
@ -127,7 +127,7 @@ final object Aggregation
|
||||||
Dag.topologicalSort(key) { k =>
|
Dag.topologicalSort(key) { k =>
|
||||||
if(reverse)
|
if(reverse)
|
||||||
reverseAggregatedKeys(k, extra, mask)
|
reverseAggregatedKeys(k, extra, mask)
|
||||||
else if(aggregationEnabled(key, extra.data))
|
else if(aggregationEnabled(k, extra.data))
|
||||||
aggregatedKeys(k, extra, mask)
|
aggregatedKeys(k, extra, mask)
|
||||||
else
|
else
|
||||||
Nil
|
Nil
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,13 @@ $ absent ran
|
||||||
$ exists ran
|
$ exists ran
|
||||||
$ delete ran
|
$ delete ran
|
||||||
|
|
||||||
# single project, Aggregate = Enabled on Mark
|
# single project, aggregate = true on Mark
|
||||||
> set aggregate in Mark := false
|
> set aggregate in Mark := true
|
||||||
> mark
|
> mark
|
||||||
$ exists ran
|
$ exists ran
|
||||||
$ delete ran
|
$ delete ran
|
||||||
|
|
||||||
# single project, Aggregate = Disabled on Mark
|
# single project, aggregate = false on Mark
|
||||||
> set aggregate in Mark := false
|
> set aggregate in Mark := false
|
||||||
> mark
|
> mark
|
||||||
$ exists ran
|
$ exists ran
|
||||||
|
|
@ -45,7 +45,7 @@ $ absent ran
|
||||||
$ exists sub/ran
|
$ exists sub/ran
|
||||||
$ delete sub/ran
|
$ delete sub/ran
|
||||||
|
|
||||||
# unset the root task. the sub task shouldn't be runnable from root
|
# unset the root task. the sub task shouldn't be runnable from root without aggregation
|
||||||
> session remove 1
|
> session remove 1
|
||||||
-> mark
|
-> mark
|
||||||
$ absent ran sub/ran
|
$ absent ran sub/ran
|
||||||
|
|
@ -80,20 +80,6 @@ $ exists ran sub/ran
|
||||||
$ absent sub/sub/ran
|
$ absent sub/sub/ran
|
||||||
$ delete ran sub/ran
|
$ delete ran sub/ran
|
||||||
|
|
||||||
# check explicit aggregation. running on root should run root/mark and sub2/mark
|
|
||||||
> set aggregate in Mark := Aggregation(sub2 :: Nil)
|
|
||||||
> mark
|
|
||||||
$ exists ran sub/sub/ran
|
|
||||||
$ absent sub/ran
|
|
||||||
$ delete ran sub/sub/ran
|
|
||||||
|
|
||||||
# check intransitive aggregation. running on root should not continue to sub2/mark
|
|
||||||
> set aggregate in Mark := Aggregation(sub :: Nil, false)
|
|
||||||
> mark
|
|
||||||
$ exists ran sub/ran
|
|
||||||
$ absent sub/sub/ran
|
|
||||||
$ delete ran sub/ran
|
|
||||||
|
|
||||||
# the aggregation setting in a leaf shouldn't affect whether it can be run directly
|
# the aggregation setting in a leaf shouldn't affect whether it can be run directly
|
||||||
> set aggregate in (sub2, Mark) := false
|
> set aggregate in (sub2, Mark) := false
|
||||||
> sub2/mark
|
> sub2/mark
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue