WIP: Try fixing tests

Author: ldionne

tests/runtest/test_suite-fail-compile.shtest

@@ -12,4 +12,5 @@
 # RUN: filecheck --check-prefix CHECK-RESULTS-FAIL-COMPILE < %t.SANDBOX/build/report.json %s
 # CHECK-RESULTS-FAIL-COMPILE: "no_errors": "False"
 # CHECK-RESULTS-FAIL-COMPILE: "run_order": "123"
-# CHECK-RESULTS-FAIL-COMPILE: "Name": "nts.bar.compile.status"
+# CHECK-RESULTS-FAIL-COMPILE: "compile.status": 1.0
+# CHECK-RESULTS-FAIL-COMPILE: "name": "nts.bar"

tests/runtest/test_suite-fail-exec.shtest

@@ -12,4 +12,5 @@
 # RUN: filecheck --check-prefix CHECK-RESULTS-FAIL-EXEC < %t.SANDBOX/build/report.json %s
 # CHECK-RESULTS-FAIL-EXEC: "no_errors": "False"
 # CHECK-RESULTS-FAIL-EXEC: "run_order": "123"
-# CHECK-RESULTS-FAIL-EXEC: "Name": "nts.baz.exec.status"
+# CHECK-RESULTS-FAIL-EXEC: "exec.status": 1.0
+# CHECK-RESULTS-FAIL-EXEC: "name": "nts.baz"

tests/runtest/test_suite-metrics.shtest

@@ -13,8 +13,9 @@
 # RUN:     > %t.log 2> %t.err
 # RUN: filecheck --check-prefix CHECK-METRICS < %t.SANDBOX/build/report.json %s
 # RUN: filecheck --check-prefix CHECK-METRICS2 < %t.SANDBOX/build/report.json %s
-# CHECK-METRICS-DAG: foo.exec
-# CHECK-METRICS-DAG: foo.compile
-# CHECK-METRICS-DAG: foo.score
-# CHECK-METRICS-DAG: foo.hash
-# CHECK-METRICS2-NOT: foo.unknown
+# CHECK-METRICS-DAG: "name": "nts.foo"
+# CHECK-METRICS-DAG: "exec":
+# CHECK-METRICS-DAG: "compile":
+# CHECK-METRICS-DAG: "score":
+# CHECK-METRICS-DAG: "hash":
+# CHECK-METRICS2-NOT: "unknown":

tests/runtest/test_suite.shtest

@@ -19,10 +19,11 @@
 
 # CHECK-REPORT: "no_errors": "True",
 # CHECK-REPORT: "run_order": "154331"
-# CHECK-REPORT: "Name": "nts.foo.compile"
-# CHECK-REPORT: "Name": "nts.foo.exec"
-# CHECK-REPORT: "Name": "nts.foo.hash"
-# CHECK-REPORT: "Name": "nts.foo.score"
+# CHECK-REPORT: "compile": 1.3
+# CHECK-REPORT: "exec": 1.4
+# CHECK-REPORT: "hash": "xyz"
+# CHECK-REPORT: "name": "nts.foo"
+# CHECK-REPORT: "score": 1.5
 #
 # CHECK-BASIC: Inferred C++ compiler under test
 # CHECK-BASIC: Configuring