From 399b6acfb1089d8cc55a399dfa3905b199d03ada Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Tue, 5 Sep 2017 14:39:48 -0500 Subject: [PATCH] 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/^ {/{/" --- tools/test/config/app_override_libs/test_data.json | 3 +-- tools/test/config/bootloader_missing/test_data.json | 2 +- tools/test/config/compound_inheritance/test_data.json | 4 +--- tools/test/config/double_define/test_data.json | 4 +--- tools/test/config/duplicate_lib_name/test_data.json | 3 +-- tools/test/config/feature_compesition/test_data.json | 3 +-- tools/test/config/feature_conflict/test_data.json | 3 +-- tools/test/config/feature_recursive_add/test_data.json | 3 +-- tools/test/config/feature_recursive_complex/test_data.json | 3 +-- tools/test/config/feature_remove/test_data.json | 3 +-- tools/test/config/feature_uvisor/test_data.json | 3 +-- tools/test/config/fetaure_recursive_conflict/test_data.json | 3 +-- tools/test/config/invalid_app_macro_define/test_data.json | 3 +-- tools/test/config/invalid_key/test_data.json | 3 +-- tools/test/config/invalid_key_lib/test_data.json | 3 +-- tools/test/config/invalid_lib_macro_define/test_data.json | 3 +-- tools/test/config/macro_inheritance/test_data.json | 3 +-- tools/test/config/override_labels_libs/test_data.json | 3 +-- tools/test/config/override_labels_libs_more/test_data.json | 3 +-- tools/test/config/override_labels_targets/test_data.json | 3 +-- tools/test/config/override_precidence/test_data.json | 3 +-- tools/test/config/override_undefined/test_data.json | 4 +--- tools/test/config/override_undefined_libs/test_data.json | 3 +-- tools/test/config/override_with_labels/test_data.json | 3 +-- tools/test/config/parameter_outside_lib/test_data.json | 3 +-- tools/test/config/simple_features/test_data.json | 3 +-- tools/test/config/simple_iheritance/test_data.json | 4 +--- 27 files changed, 27 insertions(+), 57 deletions(-) diff --git a/tools/test/config/app_override_libs/test_data.json b/tools/test/config/app_override_libs/test_data.json index 8820aceeed..b7a5ff3fd9 100644 --- a/tools/test/config/app_override_libs/test_data.json +++ b/tools/test/config/app_override_libs/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "lib1.p1": "v_p1_lib1_app", "lib1.p2": "v_p2_lib1", diff --git a/tools/test/config/bootloader_missing/test_data.json b/tools/test/config/bootloader_missing/test_data.json index 9fba661299..8159285864 100644 --- a/tools/test/config/bootloader_missing/test_data.json +++ b/tools/test/config/bootloader_missing/test_data.json @@ -1,4 +1,4 @@ - { +{ "K64F": { "exception_msg": "not found" } diff --git a/tools/test/config/compound_inheritance/test_data.json b/tools/test/config/compound_inheritance/test_data.json index fc4806fb07..1353b45531 100644 --- a/tools/test/config/compound_inheritance/test_data.json +++ b/tools/test/config/compound_inheritance/test_data.json @@ -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" } } - diff --git a/tools/test/config/double_define/test_data.json b/tools/test/config/double_define/test_data.json index 33e6310c12..791affe235 100644 --- a/tools/test/config/double_define/test_data.json +++ b/tools/test/config/double_define/test_data.json @@ -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" } } - diff --git a/tools/test/config/duplicate_lib_name/test_data.json b/tools/test/config/duplicate_lib_name/test_data.json index f5891206ac..65689b1fa4 100644 --- a/tools/test/config/duplicate_lib_name/test_data.json +++ b/tools/test/config/duplicate_lib_name/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Library name 'lib1' is not unique" } diff --git a/tools/test/config/feature_compesition/test_data.json b/tools/test/config/feature_compesition/test_data.json index afba703e49..48c56ee168 100644 --- a/tools/test/config/feature_compesition/test_data.json +++ b/tools/test/config/feature_compesition/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "expected_features": ["IPV4", "STORAGE"] } diff --git a/tools/test/config/feature_conflict/test_data.json b/tools/test/config/feature_conflict/test_data.json index b9afa309b1..b2392658d1 100644 --- a/tools/test/config/feature_conflict/test_data.json +++ b/tools/test/config/feature_conflict/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Configuration conflict. The feature IPV4 both added and removed." } diff --git a/tools/test/config/feature_recursive_add/test_data.json b/tools/test/config/feature_recursive_add/test_data.json index 33f970e7d5..08885e7f52 100644 --- a/tools/test/config/feature_recursive_add/test_data.json +++ b/tools/test/config/feature_recursive_add/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "expected_features": ["IPV4", "STORAGE", "UVISOR"] } diff --git a/tools/test/config/feature_recursive_complex/test_data.json b/tools/test/config/feature_recursive_complex/test_data.json index e8b27d4bb7..04be347b3c 100644 --- a/tools/test/config/feature_recursive_complex/test_data.json +++ b/tools/test/config/feature_recursive_complex/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "lib2.test": "GOOD" } diff --git a/tools/test/config/feature_remove/test_data.json b/tools/test/config/feature_remove/test_data.json index e4890962db..8fa0d08dd0 100644 --- a/tools/test/config/feature_remove/test_data.json +++ b/tools/test/config/feature_remove/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "expected_features": [] } diff --git a/tools/test/config/feature_uvisor/test_data.json b/tools/test/config/feature_uvisor/test_data.json index 8a4275d79b..0c29a33c35 100644 --- a/tools/test/config/feature_uvisor/test_data.json +++ b/tools/test/config/feature_uvisor/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "expected_features": ["UVISOR"] } diff --git a/tools/test/config/fetaure_recursive_conflict/test_data.json b/tools/test/config/fetaure_recursive_conflict/test_data.json index 57b3f5adfa..b31573bcba 100644 --- a/tools/test/config/fetaure_recursive_conflict/test_data.json +++ b/tools/test/config/fetaure_recursive_conflict/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Configuration conflict. The feature UVISOR both added and removed." } diff --git a/tools/test/config/invalid_app_macro_define/test_data.json b/tools/test/config/invalid_app_macro_define/test_data.json index 6c7748c91d..e679e6f59a 100644 --- a/tools/test/config/invalid_app_macro_define/test_data.json +++ b/tools/test/config/invalid_app_macro_define/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Macro 'LIB2_1' defined in both 'library:lib2' and 'application' with incompatible values" } diff --git a/tools/test/config/invalid_key/test_data.json b/tools/test/config/invalid_key/test_data.json index 9c2097d54b..564461ad6e 100644 --- a/tools/test/config/invalid_key/test_data.json +++ b/tools/test/config/invalid_key/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Unknown key(s)" } diff --git a/tools/test/config/invalid_key_lib/test_data.json b/tools/test/config/invalid_key_lib/test_data.json index 9c2097d54b..564461ad6e 100644 --- a/tools/test/config/invalid_key_lib/test_data.json +++ b/tools/test/config/invalid_key_lib/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Unknown key(s)" } diff --git a/tools/test/config/invalid_lib_macro_define/test_data.json b/tools/test/config/invalid_lib_macro_define/test_data.json index fecc9ee386..34835b12ec 100644 --- a/tools/test/config/invalid_lib_macro_define/test_data.json +++ b/tools/test/config/invalid_lib_macro_define/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "defined in both" } diff --git a/tools/test/config/macro_inheritance/test_data.json b/tools/test/config/macro_inheritance/test_data.json index 908c79f43d..a513dc97c5 100644 --- a/tools/test/config/macro_inheritance/test_data.json +++ b/tools/test/config/macro_inheritance/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"] } diff --git a/tools/test/config/override_labels_libs/test_data.json b/tools/test/config/override_labels_libs/test_data.json index 0efd5e84e5..df30ae9e10 100644 --- a/tools/test/config/override_labels_libs/test_data.json +++ b/tools/test/config/override_labels_libs/test_data.json @@ -1,5 +1,4 @@ - - { +{ "base": { "app.app1": "v_app1", "app.app2": "v_app2", diff --git a/tools/test/config/override_labels_libs_more/test_data.json b/tools/test/config/override_labels_libs_more/test_data.json index 40bafefd97..46ae967b0f 100644 --- a/tools/test/config/override_labels_libs_more/test_data.json +++ b/tools/test/config/override_labels_libs_more/test_data.json @@ -1,5 +1,4 @@ - - { +{ "base": { "app.app1": "v_app1", "app.app2": "v_app2", diff --git a/tools/test/config/override_labels_targets/test_data.json b/tools/test/config/override_labels_targets/test_data.json index b8a8971ec0..f115f5baff 100644 --- a/tools/test/config/override_labels_targets/test_data.json +++ b/tools/test/config/override_labels_targets/test_data.json @@ -1,5 +1,4 @@ - - { +{ "base": { "app.app1": "v_app1", "app.app2": "v_app2", diff --git a/tools/test/config/override_precidence/test_data.json b/tools/test/config/override_precidence/test_data.json index a754e3283c..fd853cb798 100644 --- a/tools/test/config/override_precidence/test_data.json +++ b/tools/test/config/override_precidence/test_data.json @@ -1,5 +1,4 @@ - - { +{ "base": { "app.app1": "v_app1", "app.app2": "v_app2", diff --git a/tools/test/config/override_undefined/test_data.json b/tools/test/config/override_undefined/test_data.json index c1faf3c4b2..ad0d49f205 100644 --- a/tools/test/config/override_undefined/test_data.json +++ b/tools/test/config/override_undefined/test_data.json @@ -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" } } - diff --git a/tools/test/config/override_undefined_libs/test_data.json b/tools/test/config/override_undefined_libs/test_data.json index bd49786d6b..7b936e79f4 100644 --- a/tools/test/config/override_undefined_libs/test_data.json +++ b/tools/test/config/override_undefined_libs/test_data.json @@ -1,5 +1,4 @@ - - { +{ "base": { "app.app1": "v_app1", "app.app2": "v_app2", diff --git a/tools/test/config/override_with_labels/test_data.json b/tools/test/config/override_with_labels/test_data.json index 17f94e5bbb..18baa2d3a1 100644 --- a/tools/test/config/override_with_labels/test_data.json +++ b/tools/test/config/override_with_labels/test_data.json @@ -1,5 +1,4 @@ - - { +{ "b1": { "app.app1": "v_app1[b1_label]", "app.app2": "v_app2" diff --git a/tools/test/config/parameter_outside_lib/test_data.json b/tools/test/config/parameter_outside_lib/test_data.json index d2af576ceb..1975443ec7 100644 --- a/tools/test/config/parameter_outside_lib/test_data.json +++ b/tools/test/config/parameter_outside_lib/test_data.json @@ -1,5 +1,4 @@ - - { +{ "K64F": { "exception_msg": "Invalid prefix 'lib2' for parameter name 'lib2.p1' in 'library:lib1[K64F]'" } diff --git a/tools/test/config/simple_features/test_data.json b/tools/test/config/simple_features/test_data.json index ed7dde2f24..2639e0bc1f 100644 --- a/tools/test/config/simple_features/test_data.json +++ b/tools/test/config/simple_features/test_data.json @@ -1,5 +1,4 @@ - - { +{ "test_target": { "expected_features": ["IPV4"] } diff --git a/tools/test/config/simple_iheritance/test_data.json b/tools/test/config/simple_iheritance/test_data.json index cac877a7ba..1535670cf9 100644 --- a/tools/test/config/simple_iheritance/test_data.json +++ b/tools/test/config/simple_iheritance/test_data.json @@ -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" } } -