Merge pull request #126 from w3c/include_fixup

Fix combination of --include and --exclude; r=Ms2ger

wptrunner/manifestinclude.py

@@ -57,7 +57,7 @@ def _include(self, test, path_components):
             try:
                 skip_value = self.get("skip", {"test_type": test.item_type}).lower()
                 assert skip_value in ("true", "false")
-                return False if skip_value == "true" else True
+                return skip_value != "true"
             except KeyError:
                 if node.parent is not None:
                     node = node.parent
@@ -107,6 +107,7 @@ def _add_rule(self, test_manifests, url, direction):
             if component not in node.child_map:
                 new_node = IncludeManifest(DataNode(component))
                 node.append(new_node)
+                new_node.set("skip", node.get("skip", {}))
 
             node = node.child_map[component]