[LNT] r307283 - Fix wrong mapping in compile suite upgrading logic

[Matthias Braun via llvm-commits]

Author: matze
Date: Thu Jul  6 10:38:52 2017
New Revision: 307283

URL: http://llvm.org/viewvc/llvm-project?rev=307283&view=rev
Log:
Fix wrong mapping in compile suite upgrading logic

This is another followup to r306740.

Added:
    lnt/trunk/tests/lnttool/Inputs/compile_submission.json
Modified:
    lnt/trunk/lnt/testing/__init__.py
    lnt/trunk/tests/lnttool/submit.py

Modified: lnt/trunk/lnt/testing/__init__.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/testing/__init__.py?rev=307283&r1=307282&r2=307283&view=diff
==============================================================================
--- lnt/trunk/lnt/testing/__init__.py (original)
+++ lnt/trunk/lnt/testing/__init__.py Thu Jul  6 10:38:52 2017
@@ -274,16 +274,16 @@ _nts_upgrade = _UpgradeSchema(
 )
 _compile_upgrade = _UpgradeSchema(
     metric_rename={
-        '.mem.bytes': 'mem_bytes',
+        '.mem': 'mem_bytes',
         '.mem.status': 'mem_status',
-        '.size.bytes': 'size_bytes',
+        '.size': 'size_bytes',
         '.size.status': 'size_status',
+        '.sys': 'sys_time',
         '.sys.status': 'sys_status',
+        '.user': 'user_time',
         '.user.status': 'user_status',
-        '.user.time': 'sys_time',
-        '.user.time': 'user_time',
+        '.wall': 'wall_time',
         '.wall.status': 'wall_status',
-        '.wall.time': 'wall_time',
     }, machine_param_rename = {
         'hw.model': 'hardware',
         'kern.version': 'os_version',

Added: lnt/trunk/tests/lnttool/Inputs/compile_submission.json
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/Inputs/compile_submission.json?rev=307283&view=auto
==============================================================================
--- lnt/trunk/tests/lnttool/Inputs/compile_submission.json (added)
+++ lnt/trunk/tests/lnttool/Inputs/compile_submission.json Thu Jul  6 10:38:52 2017
@@ -0,0 +1,74 @@
+{
+	"Machine": {
+		"Info": {
+			"hw.activecpu": "4",
+			"machdep.cpu.vendor": "GenuineIntel"
+		},
+		"Name": "some-compile-suite-machine"
+	},
+	"Run": {
+		"End Time": "2017-07-06 15:37:08",
+		"Start Time": "2017-07-06 15:05:23",
+		"Info": {
+			"__report_version__": "1",
+			"run_order": "663345",
+			"tag": "compile"
+		}
+	},
+	"Tests": [
+        {
+            "Data": [
+                14.601326,
+                14.411566,
+                14.490528
+            ],
+            "Info": {},
+            "Name": "compile.build/Adium-1.5.7(config='Debug',j=1).user"
+        },
+        {
+            "Data": [
+                6.35114,
+                6.021678,
+                6.008406
+            ],
+            "Info": {},
+            "Name": "compile.build/Adium-1.5.7(config='Debug',j=1).sys"
+        },
+        {
+            "Data": [
+                20.398301,
+                20.121045,
+                19.722336
+            ],
+            "Info": {},
+            "Name": "compile.build/Adium-1.5.7(config='Debug',j=1).wall"
+        },
+        {
+            "Data": [
+                38.057092,
+                38.091625,
+                38.051625
+            ],
+            "Info": {},
+            "Name": "compile.build/Adium-1.5.7(config='Release',j=1).user"
+        },
+                {
+            "Data": [
+                12.423008,
+                12.409628,
+                12.398736
+            ],
+            "Info": {},
+            "Name": "compile.build/Adium-1.5.7(config='Release',j=1).sys"
+        },
+        {
+            "Data": [
+                50.016597,
+                49.881782,
+                49.90554
+            ],
+            "Info": {},
+            "Name": "compile.build/Adium-1.5.7(config='Release',j=1).wall"
+        }
+	]
+}

Modified: lnt/trunk/tests/lnttool/submit.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/submit.py?rev=307283&r1=307282&r2=307283&view=diff
==============================================================================
--- lnt/trunk/tests/lnttool/submit.py (original)
+++ lnt/trunk/tests/lnttool/submit.py Thu Jul  6 10:38:52 2017
@@ -51,3 +51,24 @@
 # CHECK-NEWFORMAT: ----------------
 # CHECK-NEWFORMAT: PASS : 10
 # CHECK-NEWFORMAT: Results available at: http://localhost:9091/db_default/v4/nts/3
+#
+# RUN: rm -rf %t.instance
+# RUN: python %{shared_inputs}/create_temp_instance.py \
+# RUN:   %s %{shared_inputs}/SmallInstance %t.instance
+# RUN: %{shared_inputs}/server_wrapper.sh %t.instance 9091 \
+# RUN:   lnt submit "http://localhost:9091/db_default/v4/compile/submitRun" \
+# RUN:   --commit=1 %S/Inputs/compile_submission.json -v \
+# RUN:   | FileCheck %s --check-prefix=CHECK-OLDFORMAT-COMPILE
+#
+# CHECK-OLDFORMAT-COMPILE: --- Tested: 10 tests --
+#
+# CHECK-OLDFORMAT-COMPILE: Imported Data
+# CHECK-OLDFORMAT-COMPILE: -------------
+# CHECK-OLDFORMAT-COMPILE: Added Machines: 1
+# CHECK-OLDFORMAT-COMPILE: Added Runs    : 1
+# CHECK-OLDFORMAT-COMPILE: Added Tests   : 2
+#
+# CHECK-OLDFORMAT-COMPILE: Results
+# CHECK-OLDFORMAT-COMPILE: ----------------
+# CHECK-OLDFORMAT-COMPILE: PASS : 10
+# CHECK-OLDFORMAT-COMPILE: Results available at: http://localhost:9091/db_default/v4/compile/5