commit 509617331832974e191ae5a0206e170ba6db29d0
author Jorge E. Moreira <jemoreira@google.com> Mon Nov 12 17:43:24 2018 -0800
committer Jorge E. Moreira <jemoreira@google.com> Mon Nov 12 21:39:39 2018 -0800
tree db832b3a1cdce5b12b557b49b1e734f63195b7d3
parent 734e1d14ecb7c45f31492035f6005b227f46a40f

Only run guest side e2e test if the flag is given to the launcher

Bug: 118688323
Test: build & run locally
Change-Id: I76bd1902f47cfd92253941da4fbe5fb5a52b8a9d

guest/vsoc/lib/guest_region_e2e_test.cpp

diff --git a/guest/vsoc/lib/guest_region_e2e_test.cpp b/guest/vsoc/lib/guest_region_e2e_test.cpp
index 4ce9060..b7f5f9f 100644
--- a/guest/vsoc/lib/guest_region_e2e_test.cpp
+++ b/guest/vsoc/lib/guest_region_e2e_test.cpp
@@ -142,6 +142,8 @@
     auto region = vsoc::E2EPrimaryRegionView::GetInstance();
     region->guest_status(vsoc::layout::e2e_test::E2E_MEMORY_FILLED);
     LOG(INFO) << "stage_1_guest_region_e2e_tests PASSED";
+  } else {
+    LOG(ERROR) << "stage_1_guest_region_e2e_tests FAILED";
   }
   return rval;
 }

host/commands/launch/main.cc

diff --git a/host/commands/launch/main.cc b/host/commands/launch/main.cc
index ecfd09f..989d0a9 100644
--- a/host/commands/launch/main.cc
+++ b/host/commands/launch/main.cc
@@ -696,6 +696,9 @@
       tmp_config_obj.add_kernel_cmdline("audit=0");
     }
   }
+  if (FLAGS_run_e2e_test) {
+    tmp_config_obj.add_kernel_cmdline("androidboot.vsoc_e2e_test=1");
+  }
   if (FLAGS_extra_kernel_cmdline.size()) {
     tmp_config_obj.add_kernel_cmdline(FLAGS_extra_kernel_cmdline);
   }