From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Tue, 16 Dec 2014 07:55:56 +0000 (+0100)
Subject: normalize parameter_handler_write_json.output for different boost versions
X-Git-Tag: v8.2.0-rc1~12^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F344%2Fhead;p=dealii.git

normalize parameter_handler_write_json.output for different boost versions
---

diff --git a/tests/bits/parameter_handler_write_json.output b/tests/bits/parameter_handler_write_json.output
index 434c513a52..817fb72ea8 100644
--- a/tests/bits/parameter_handler_write_json.output
+++ b/tests/bits/parameter_handler_write_json.output
@@ -1,29 +1,35 @@
 
 {
-    "int1": {
+    "int1":
+    {
         "value": "1",
         "default_value": "1",
         "documentation": "doc 1",
         "pattern": "0",
         "pattern_description": "[Integer range -2147483648...2147483647 (inclusive)]"
     },
-    "int2": {
+    "int2":
+    {
         "value": "2",
         "default_value": "2",
         "documentation": "doc 2",
         "pattern": "1",
         "pattern_description": "[Integer range -2147483648...2147483647 (inclusive)]"
     },
-    "ss1": {
-        "double_201": {
+    "ss1":
+    {
+        "double_201":
+        {
             "value": "1.234",
             "default_value": "1.234",
             "documentation": "doc 3",
             "pattern": "2",
             "pattern_description": "[Double -1.79769e+308...1.79769e+308 (inclusive)]"
         },
-        "ss2": {
-            "double_202": {
+        "ss2":
+        {
+            "double_202":
+            {
                 "value": "4.321",
                 "default_value": "4.321",
                 "documentation": "doc 4",
@@ -32,22 +38,26 @@
             }
         }
     },
-    "Testing_25testing": {
-        "string_26list": {
+    "Testing_25testing":
+    {
+        "string_26list":
+        {
             "value": "< & > ; \/",
             "default_value": "< & > ; \/",
             "documentation": "docs 1",
             "pattern": "4",
             "pattern_description": "[Anything]"
         },
-        "int_2aint": {
+        "int_2aint":
+        {
             "value": "2",
             "default_value": "2",
             "documentation": "",
             "pattern": "5",
             "pattern_description": "[Integer range -2147483648...2147483647 (inclusive)]"
         },
-        "double_2bdouble": {
+        "double_2bdouble":
+        {
             "value": "6.1415926",
             "default_value": "6.1415926",
             "documentation": "docs 3",
diff --git a/tests/normalize.pl b/tests/normalize.pl
index c35aca2630..22e68654f1 100644
--- a/tests/normalize.pl
+++ b/tests/normalize.pl
@@ -87,3 +87,14 @@ s/written by deal\.II \d+\.\d+\.(pre|\d+)/written by deal.II x.y.z/;
 # To deal with these issues, we simply delete these lines
 s/.*<PCellData Scalars.*\n//g;
 s/.*<PDataArray type.*(mpirank|level).*\n//g;
+
+#
+# Different boost versions output output the opening bracket for json
+# output on a new line. Thus always transform
+#     "label": {
+#
+# into
+#     "label":
+#     {
+#
+s/^(\s*)(".*":) \{$/\1\2\n\1\{/;