Merge pull request #2879 from bridadan/fix-config-tests-ipv6

Renames IPV6 feature used in config test to STORAGE
pull/2243/merge
Sam Grove 2016-10-01 17:22:38 -05:00 committed by GitHub
commit cf60b189b0
13 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
{ {
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features": ["IPV4", "IPV6"] "target.features": ["IPV4"]
} }
} }
} }

View File

@ -3,6 +3,6 @@
expected_results = { expected_results = {
"test_target": { "test_target": {
"desc": "test basic features", "desc": "test basic features",
"expected_features": ["IPV4", "IPV6"] "expected_features": ["IPV4"]
} }
} }

View File

@ -1,7 +1,7 @@
{ {
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV6"] "target.features_add": ["STORAGE"]
} }
} }
} }

View File

@ -3,6 +3,6 @@
expected_results = { expected_results = {
"test_target": { "test_target": {
"desc": "test composing features", "desc": "test composing features",
"expected_features": ["IPV4", "IPV6"] "expected_features": ["IPV4", "STORAGE"]
} }
} }

View File

@ -1,7 +1,7 @@
{ {
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV6"] "target.features_add": ["STORAGE"]
} }
} }
} }

View File

@ -2,7 +2,7 @@
"name": "lib1", "name": "lib1",
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV6"] "target.features_add": ["STORAGE"]
} }
} }
} }

View File

@ -3,6 +3,6 @@
expected_results = { expected_results = {
"test_target": { "test_target": {
"desc": "test recursive features", "desc": "test recursive features",
"expected_features": ["IPV4", "IPV6", "UVISOR"] "expected_features": ["IPV4", "STORAGE", "UVISOR"]
} }
} }

View File

@ -2,7 +2,7 @@
"name": "lib1", "name": "lib1",
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV6"] "target.features_add": ["STORAGE"]
} }
} }
} }

View File

@ -1,7 +1,7 @@
{ {
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features": ["IPV4", "IPV6"] "target.features": ["IPV4", "STORAGE"]
} }
} }
} }

View File

@ -2,7 +2,7 @@
"name": "lib1", "name": "lib1",
"target_overrides": { "target_overrides": {
"*": { "*": {
"target.features_add": ["IPV6"] "target.features_add": ["STORAGE"]
} }
} }
} }