commit 1001c80a8e798a9511595cd4e921ad0cb49852a8
author Jiakai Zhang <jiakaiz@google.com> Tue Dec 14 19:00:55 2021 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 15 14:54:41 2021 +0000
tree ba8ad99fafa909f6be4971f1a37e5000a1c2c1e1
parent 8a868f71a7bad52c38337cba2273cd3ed7568f07

Update dexpreopt_test to also check standalone system server jars.

Bug: 203198541
Test: atest art_standalone_dexpreopt_tests
Change-Id: Ifdfbaf6057996db3bec34d49f12d7f99feada82c

test/dexpreopt/dexpreopt_test.cc

diff --git a/test/dexpreopt/dexpreopt_test.cc b/test/dexpreopt/dexpreopt_test.cc
index aaa6501..2dd5662 100644
--- a/test/dexpreopt/dexpreopt_test.cc
+++ b/test/dexpreopt/dexpreopt_test.cc
@@ -24,6 +24,8 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 
+#include <algorithm>
+#include <iterator>
 #include <string>
 #include <unordered_set>
 #include <vector>
@@ -42,16 +44,26 @@
 
 using ::testing::IsSubsetOf;
 
-android::base::Result<std::vector<std::string>> GetSystemServerArtifacts() {
-  const char* env_value = getenv("SYSTEMSERVERCLASSPATH");
-  if (env_value == nullptr) {
-    return Errorf("Environment variable `SYSTEMSERVERCLASSPATH` is not defined");
+std::vector<std::string> GetListFromEnv(const std::string& name) {
+  const char* env_value = getenv(name.c_str());
+  if (env_value == nullptr || strlen(env_value) == 0) {
+    return {};
   }
+  return android::base::Split(env_value, ":");
+}
+
+android::base::Result<std::vector<std::string>> GetSystemServerArtifacts() {
+  std::vector<std::string> jars = GetListFromEnv("SYSTEMSERVERCLASSPATH");
+  if (jars.empty()) {
+    return Errorf("Environment variable `SYSTEMSERVERCLASSPATH` is not defined or empty");
+  }
+  std::vector<std::string> standalone_jars = GetListFromEnv("STANDALONE_SYSTEMSERVER_JARS");
+  std::move(standalone_jars.begin(), standalone_jars.end(), std::back_inserter(jars));
   if (kRuntimeISA == InstructionSet::kNone) {
     return Errorf("Unable to get system server ISA");
   }
   std::vector<std::string> artifacts;
-  for (const std::string& jar : android::base::Split(env_value, ":")) {
+  for (const std::string& jar : jars) {
     std::string error_msg;
     std::string odex_file;