Clean up json

Wipe out all blank lines in json:
  find tools/test -name 'test_data.json' | xargs sed -i -e '/^$/d'
Move all start braces back a space:
  find tools/test -name 'test_data.json' | xargs sed -i -e "s/^ {/{/"
pull/4984/head
Jimmy Brisson 2017-09-05 14:39:48 -05:00
parent b0501bd846
commit 399b6acfb1
27 changed files with 27 additions and 57 deletions

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"lib1.p1": "v_p1_lib1_app",
"lib1.p2": "v_p2_lib1",

View File

@ -1,4 +1,4 @@
{
{
"K64F": {
"exception_msg": "not found"
}

View File

@ -1,5 +1,4 @@
{
{
"f": {
"target.base1_1": "v_base1_1_f",
"target.base1_2": "v_base1_2_b2",
@ -19,4 +18,3 @@
"target.base2_2": "v_base2_2_b2"
}
}

View File

@ -1,5 +1,4 @@
{
{
"f": {
"exception_msg": "Parameter name 'base1_1' defined in both 'target:b2' and 'target:b1'"
},
@ -9,4 +8,3 @@
"target.base1_1": "v_base1_1_b2"
}
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Library name 'lib1' is not unique"
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"expected_features": ["IPV4", "STORAGE"]
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Configuration conflict. The feature IPV4 both added and removed."
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"expected_features": ["IPV4", "STORAGE", "UVISOR"]
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"lib2.test": "GOOD"
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"expected_features": []
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"expected_features": ["UVISOR"]
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Configuration conflict. The feature UVISOR both added and removed."
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Macro 'LIB2_1' defined in both 'library:lib2' and 'application' with incompatible values"
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Unknown key(s)"
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Unknown key(s)"
}

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "defined in both"
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"]
}

View File

@ -1,5 +1,4 @@
{
{
"base": {
"app.app1": "v_app1",
"app.app2": "v_app2",

View File

@ -1,5 +1,4 @@
{
{
"base": {
"app.app1": "v_app1",
"app.app2": "v_app2",

View File

@ -1,5 +1,4 @@
{
{
"base": {
"app.app1": "v_app1",
"app.app2": "v_app2",

View File

@ -1,5 +1,4 @@
{
{
"base": {
"app.app1": "v_app1",
"app.app2": "v_app2",

View File

@ -1,5 +1,4 @@
{
{
"f": {
"exception_msg": "Attempt to override undefined parameter 'base1_1' in 'target:b2'"
},
@ -11,4 +10,3 @@
"target.derived2": "v_derived2_d1"
}
}

View File

@ -1,5 +1,4 @@
{
{
"base": {
"app.app1": "v_app1",
"app.app2": "v_app2",

View File

@ -1,5 +1,4 @@
{
{
"b1": {
"app.app1": "v_app1[b1_label]",
"app.app2": "v_app2"

View File

@ -1,5 +1,4 @@
{
{
"K64F": {
"exception_msg": "Invalid prefix 'lib2' for parameter name 'lib2.p1' in 'library:lib1[K64F]'"
}

View File

@ -1,5 +1,4 @@
{
{
"test_target": {
"expected_features": ["IPV4"]
}

View File

@ -1,5 +1,4 @@
{
{
"f": {
"target.base1_1": "v_base1_1_f",
"target.base1_2": "v_base1_2_d1",
@ -24,4 +23,3 @@
"target.derived2": "v_derived2_d1"
}
}