Fix nesting of test run

Change-Id: I03497490dc4c79fa19124c9f9c010f86d918a14e
Reviewed-on: https://gn-review.googlesource.com/1643
Reviewed-by: Petr Hosek <phosek@google.com>
Commit-Queue: Scott Graham <scottmg@chromium.org>

infra/recipes/gn.expected/ci_linux.json

diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json
index 01f95ba..b313dc9 100644
--- a/infra/recipes/gn.expected/ci_linux.json
+++ b/infra/recipes/gn.expected/ci_linux.json
@@ -125,9 +125,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "debug.build.test",
+    "name": "debug.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -181,9 +181,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "release.build.test",
+    "name": "release.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {

infra/recipes/gn.expected/ci_mac.json

diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json
index 89db3b6..c4f9847 100644
--- a/infra/recipes/gn.expected/ci_mac.json
+++ b/infra/recipes/gn.expected/ci_mac.json
@@ -109,9 +109,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "debug.build.test",
+    "name": "debug.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -153,9 +153,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "release.build.test",
+    "name": "release.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {

infra/recipes/gn.expected/ci_win.json

diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json
index 1a6f953..9d57f03 100644
--- a/infra/recipes/gn.expected/ci_win.json
+++ b/infra/recipes/gn.expected/ci_win.json
@@ -216,9 +216,9 @@
     "cmd": [
       "[START_DIR]\\gn\\out\\gn_unittests"
     ],
-    "name": "debug.build.test",
+    "name": "debug.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -293,9 +293,9 @@
     "cmd": [
       "[START_DIR]\\gn\\out\\gn_unittests"
     ],
-    "name": "release.build.test",
+    "name": "release.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {

infra/recipes/gn.expected/cq_linux.json

diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json
index 33d30ba..b974d7b 100644
--- a/infra/recipes/gn.expected/cq_linux.json
+++ b/infra/recipes/gn.expected/cq_linux.json
@@ -152,9 +152,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "debug.build.test",
+    "name": "debug.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -208,9 +208,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "release.build.test",
+    "name": "release.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {

infra/recipes/gn.expected/cq_mac.json

diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json
index 600c99a..6824324 100644
--- a/infra/recipes/gn.expected/cq_mac.json
+++ b/infra/recipes/gn.expected/cq_mac.json
@@ -136,9 +136,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "debug.build.test",
+    "name": "debug.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -180,9 +180,9 @@
     "cmd": [
       "[START_DIR]/gn/out/gn_unittests"
     ],
-    "name": "release.build.test",
+    "name": "release.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {

infra/recipes/gn.expected/cq_win.json

diff --git a/infra/recipes/gn.expected/cq_win.json b/infra/recipes/gn.expected/cq_win.json
index 79189fd..b09f254 100644
--- a/infra/recipes/gn.expected/cq_win.json
+++ b/infra/recipes/gn.expected/cq_win.json
@@ -243,9 +243,9 @@
     "cmd": [
       "[START_DIR]\\gn\\out\\gn_unittests"
     ],
-    "name": "debug.build.test",
+    "name": "debug.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
@@ -320,9 +320,9 @@
     "cmd": [
       "[START_DIR]\\gn\\out\\gn_unittests"
     ],
-    "name": "release.build.test",
+    "name": "release.test",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {

infra/recipes/gn.py

diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py
index de00c2b..d8ccd79 100644
--- a/infra/recipes/gn.py
+++ b/infra/recipes/gn.py
@@ -133,7 +133,7 @@
           api.step('taskkill mspdbsrv',
                    ['taskkill.exe', '/f', '/t', '/im', 'mspdbsrv.exe'])
 
-        api.step('test', [src_dir.join('out', 'gn_unittests')])
+      api.step('test', [src_dir.join('out', 'gn_unittests')])
 
 
 def GenTests(api):