Merge branch 'rc'

core/src/main/java/hudson/matrix/MatrixBuild.java

@@ -138,6 +138,21 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
         return r;
     }
 
+    /**
+     * Returns all {@link MatrixRun}s for this {@link MatrixBuild}.
+     * <p>
+     * Unlike {@link #getExactRuns()}, this method excludes those runs
+     * that didn't run and got inherited.
+     */
+    public List<MatrixRun> getExactRuns() {
+        List<MatrixRun> r = new ArrayList<MatrixRun>();
+        for(MatrixConfiguration c : getParent().getItems()) {
+            MatrixRun b = c.getBuildByNumber(getNumber());
+            if (b != null) r.add(b);
+        }
+        return r;
+    }
+
     @Override
     public String getWhyKeepLog() {
         MatrixBuild b = getNextBuild();

test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy

@@ -122,7 +122,7 @@ public class MatrixProjectTest extends HudsonTestCase {
 
         p.getBuildersList().add(new UnstableBuilder());
         build = p.scheduleBuild2(0).get();
-        assertEquals(2, build.getRuns().size());
+        assertEquals(2, build.exactRuns.size());
     }
 
     @Override