commit e34764043e78dba45a78584dee38cf51d35578d1
author Brian Goldman <bgoldman@google.com> Mon May 22 14:38:23 2017 -0700
committer Brian Goldman <bgoldman@google.com> Mon May 22 14:38:23 2017 -0700
tree 86697c6928281aedbd1ffccf4ad2785f0bd08072
parent 2f53fb9e473d8fc8cbd0530c553ee207cf2e5150

Show what is in autorun

Change-Id: I6a8c88711670cc2527714c1f07664e4308559670

recipes/magenta.expected/ci.json

diff --git a/recipes/magenta.expected/ci.json b/recipes/magenta.expected/ci.json
index 5c5ecac..7bfd123 100644
--- a/recipes/magenta.expected/ci.json
+++ b/recipes/magenta.expected/ci.json
@@ -126,7 +126,14 @@
       "msleep 500\nruntests\nmsleep 3000\ndm poweroff",
       "[TMP_BASE]/magenta_tmp/autorun"
     ],
-    "name": "write autorun"
+    "name": "write autorun",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 500@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@runtests@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 3000@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@dm poweroff@@@",
+      "@@@STEP_LOG_END@autorun.sh@@@"
+    ]
   },
   {
     "cmd": [

recipes/magenta.expected/cq_try.json

diff --git a/recipes/magenta.expected/cq_try.json b/recipes/magenta.expected/cq_try.json
index 1a9532b..7fdbf37 100644
--- a/recipes/magenta.expected/cq_try.json
+++ b/recipes/magenta.expected/cq_try.json
@@ -137,7 +137,14 @@
       "msleep 500\nruntests\nmsleep 3000\ndm poweroff",
       "[TMP_BASE]/magenta_tmp/autorun"
     ],
-    "name": "write autorun"
+    "name": "write autorun",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 500@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@runtests@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 3000@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@dm poweroff@@@",
+      "@@@STEP_LOG_END@autorun.sh@@@"
+    ]
   },
   {
     "cmd": [

recipes/magenta.expected/failed_qemu.json

diff --git a/recipes/magenta.expected/failed_qemu.json b/recipes/magenta.expected/failed_qemu.json
index 0e1de5a..6ea1574 100644
--- a/recipes/magenta.expected/failed_qemu.json
+++ b/recipes/magenta.expected/failed_qemu.json
@@ -126,7 +126,14 @@
       "msleep 500\nruntests\nmsleep 3000\ndm poweroff",
       "[TMP_BASE]/magenta_tmp/autorun"
     ],
-    "name": "write autorun"
+    "name": "write autorun",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 500@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@runtests@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 3000@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@dm poweroff@@@",
+      "@@@STEP_LOG_END@autorun.sh@@@"
+    ]
   },
   {
     "cmd": [

recipes/magenta.expected/test_ouput.json

diff --git a/recipes/magenta.expected/test_ouput.json b/recipes/magenta.expected/test_ouput.json
index af1f276..2d692f7 100644
--- a/recipes/magenta.expected/test_ouput.json
+++ b/recipes/magenta.expected/test_ouput.json
@@ -126,7 +126,14 @@
       "msleep 500\nruntests\nmsleep 3000\ndm poweroff",
       "[TMP_BASE]/magenta_tmp/autorun"
     ],
-    "name": "write autorun"
+    "name": "write autorun",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 500@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@runtests@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@msleep 3000@@@",
+      "@@@STEP_LOG_LINE@autorun.sh@dm poweroff@@@",
+      "@@@STEP_LOG_END@autorun.sh@@@"
+    ]
   },
   {
     "cmd": [

recipes/magenta.py

diff --git a/recipes/magenta.py b/recipes/magenta.py
index 6086d3e..dd96191 100644
--- a/recipes/magenta.py
+++ b/recipes/magenta.py
@@ -66,10 +66,14 @@
   tmp_dir = api.path['tmp_base'].join('magenta_tmp')
   api.shutil.makedirs('tmp', tmp_dir)
   path = tmp_dir.join('autorun')
-  api.shutil.write('write autorun', path, '''msleep 500
-runtests
-msleep 3000
-dm poweroff''')
+  autorun = [
+    'msleep 500',
+    'runtests',
+    'msleep 3000',
+    'dm poweroff',
+  ]
+  step_result = api.shutil.write('write autorun', path, '\n'.join(autorun))
+  step_result.presentation.logs['autorun.sh'] = autorun
 
   build_args = [
     'make',