commit 377bd8bbd7ab92a9341d01621f30e9863e30fd65
author Andrew Walbran <qwandor@google.com> Mon Feb 04 17:51:04 2019 +0000
committer Andrew Walbran <qwandor@google.com> Tue Feb 12 17:57:47 2019 +0000
tree bb91d804d85e8fdf39d5f4d78ba4b5058dcefd1b
parent eb1997c0e28cdd16a4738de49a46ab64677fc0d7

Use target_out_dir rather than root_out_dir for VM images and initrds.

Change-Id: I23c6573d14b871841f8dc5b5a42ec32c381c7fa2

build/image/image.gni

diff --git a/build/image/image.gni b/build/image/image.gni
index 9866a24..5bce4ef 100644
--- a/build/image/image.gni
+++ b/build/image/image.gni
@@ -107,7 +107,7 @@
                              "sources",
                              "testonly",
                            ])
-    output_path = "vm"
+    output_path = rebase_path(".", root_out_dir, target_out_dir)
     image_name = target_name
   }
 }
@@ -121,18 +121,18 @@
     forward_variables_from(invoker, [ "testonly" ])
     script = "//build/image/generate_initrd.py"
 
-    initrd_base = "${root_out_dir}/initrd/${target_name}"
+    initrd_base = "${target_out_dir}/${target_name}/initrd"
     initrd_file = "${initrd_base}.img"
     initrd_staging = "${initrd_base}"
-    vm_dir = rebase_path("${root_out_dir}/vm/")
 
     deps = [
       invoker.primary_vm,
     ]
 
+    primary_vm_outputs = get_target_outputs(invoker.primary_vm)
     args = [
       "--primary_vm",
-      vm_dir + get_label_info(invoker.primary_vm, "name") + ".bin",
+      rebase_path(primary_vm_outputs[0]),
       "--staging",
       rebase_path(initrd_staging),
       "--output",
@@ -154,7 +154,8 @@
           vm[0],
           vm[1],
           vm[2],
-          vm_dir + get_label_info(vm[3], "name") + ".bin",
+          rebase_path(get_label_info(vm[3], "target_out_dir") + "/" +
+                      get_label_info(vm[3], "name") + ".bin"),
         ]
       }
     }

kokoro/ubuntu/test.sh

diff --git a/kokoro/ubuntu/test.sh b/kokoro/ubuntu/test.sh
index 5d796f8..c060f43 100755
--- a/kokoro/ubuntu/test.sh
+++ b/kokoro/ubuntu/test.sh
@@ -42,6 +42,6 @@
 
 # Run the tests with a timeout so they can't loop forever.
 $HFTEST arch_test
-$HFTEST hafnium --initrd gicv3_test
-$HFTEST hafnium --initrd primary_only_test
-$HFTEST hafnium --initrd primary_with_secondaries_test
+$HFTEST hafnium --initrd test/vmapi/gicv3/gicv3_test
+$HFTEST hafnium --initrd test/vmapi/primary_only/primary_only_test
+$HFTEST hafnium --initrd test/vmapi/primary_with_secondaries/primary_with_secondaries_test

test/hftest/hftest.py

diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 74db312..40aeaca 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -84,7 +84,7 @@
     initrd = None
     suite = args.image
     if args.initrd:
-        initrd = os.path.join(args.out, "initrd", args.initrd + ".img")
+        initrd = os.path.join(args.out, "obj", args.initrd, "initrd.img")
         suite += "_" + args.initrd
     log = os.path.join(args.log, suite)
     ensure_dir(log)