Merge changes I219c2b3a,I7af6fe67

* changes:
  Improve memory tracking in vulkan memory mapping tests
  Optimize random memory mapping tests reference memory

diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
index ef6034a..280d76d 100644 (file)
--- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
+++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
@@ -2049,7 +2049,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
      * {@inheritDoc}
      */
     @Override
-    public void addAllIncludeFilters(List<String> filters) {
+    public void addAllIncludeFilters(Set<String> filters) {
         mIncludeFilters.addAll(filters);
     }
 
@@ -2065,7 +2065,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
      * {@inheritDoc}
      */
     @Override
-    public void addAllExcludeFilters(List<String> filters) {
+    public void addAllExcludeFilters(Set<String> filters) {
         mExcludeFilters.addAll(filters);
     }
 

diff --git a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
index b11377c..249fcf9 100644 (file)
--- a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
+++ b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
@@ -47,8 +47,10 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -634,8 +636,8 @@ public class DeqpTestRunnerTest extends TestCase {
         return output.toString();
     }
 
-    private void testFiltering(List<String> includes,
-                               List<String> excludes,
+    private void testFiltering(Set<String> includes,
+                               Set<String> excludes,
                                List<TestIdentifier> fullTestList,
                                String expectedTrie,
                                List<TestIdentifier> expectedTests) throws Exception {
@@ -732,7 +734,7 @@ public class DeqpTestRunnerTest extends TestCase {
 
         String expectedTrie = "{dEQP-GLES3{pick_me{yes,ok,accepted}}}";
 
-        ArrayList<String> includes = new ArrayList();
+        Set<String> includes = new HashSet();
         includes.add("dEQP-GLES3.pick_me#*");
         testFiltering(includes, null, allTests, expectedTrie, activeTests);
     }
@@ -759,7 +761,7 @@ public class DeqpTestRunnerTest extends TestCase {
 
         String expectedTrie = "{dEQP-GLES3{pick_me{yes,ok,accepted}}}";
 
-        ArrayList<String> excludes = new ArrayList();
+        Set<String> excludes = new HashSet();
         excludes.add("dEQP-GLES3.missing#*");
         testFiltering(null, excludes, allTests, expectedTrie, activeTests);
     }
@@ -784,10 +786,10 @@ public class DeqpTestRunnerTest extends TestCase {
 
         String expectedTrie = "{dEQP-GLES3{group2{yes}}}";
 
-        ArrayList<String> includes = new ArrayList();
+        Set<String> includes = new HashSet();
         includes.add("dEQP-GLES3.group2#*");
 
-        ArrayList<String> excludes = new ArrayList();
+        Set<String> excludes = new HashSet();
         excludes.add("*foo");
         excludes.add("*thoushallnotpass");
         testFiltering(includes, excludes, allTests, expectedTrie, activeTests);
@@ -810,7 +812,7 @@ public class DeqpTestRunnerTest extends TestCase {
 
         String expectedTrie = "{dEQP-GLES3{group1{mememe,yeah,takeitall},group2{jeba,yes,granted}}}";
 
-        ArrayList<String> includes = new ArrayList();
+        Set<String> includes = new HashSet();
         includes.add("*");
 
         testFiltering(includes, null, allTests, expectedTrie, allTests);
@@ -833,7 +835,7 @@ public class DeqpTestRunnerTest extends TestCase {
 
         String expectedTrie = "";
 
-        ArrayList<String> excludes = new ArrayList();
+        Set<String> excludes = new HashSet();
         excludes.add("*");
 
         testFiltering(null, excludes, allTests, expectedTrie, new ArrayList<TestIdentifier>());

diff --git a/doc/testlog-stylesheet/testlog.xsl b/doc/testlog-stylesheet/testlog.xsl
index e2225a3..f8e1400 100644 (file)
--- a/doc/testlog-stylesheet/testlog.xsl
+++ b/doc/testlog-stylesheet/testlog.xsl
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-# drawElements Quality Program utilities
-# --------------------------------------
-#
-# Copyright 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#-------------------------------------------------------------------------
+    drawElements Quality Program utilities
+
+    Copyright 2016 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 <xsl:stylesheet
        version="1.0"