Clean up json

theotherjimmy · theotherjimmy · commit 399b6acfb108 · 2017-09-05T14:39:48.000-05:00
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/^ {/{/"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- {`
	`1`	`+{`
`2`	`2`	`"K64F": {`
`3`	`3`	`"exception_msg": "not found"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-`
`2`		`- {`
	`1`	`+{`
`3`	`2`	`"f": {`
`4`	`3`	`"target.base1_1": "v_base1_1_f",`
`5`	`4`	`"target.base1_2": "v_base1_2_b2",`
`@@ -19,4 +18,3 @@`
`19`	`18`	`"target.base2_2": "v_base2_2_b2"`
`20`	`19`	`}`
`21`	`20`	`}`
`22`		`-`