commit 373f17661fac2638cb3507dbe5947d5adf0bfee2
author Austin Schuh <austin.linux@gmail.com> Wed Jun 02 21:07:09 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Wed Jun 02 21:14:06 2021 -0700
tree c98dfaf146671b8263a76b13d5cbe922a3b8e3c0
parent 909698b6d1607334631210e48541849a3d14e306

Create ArtifactPath function to abstract test paths

When AOS is included as an external repo and renamed, paths have to be
updated.  Make a function to handle all this.

Change-Id: If1dfbfb3191809d86da1dca92981b7a0b851c51f

aos/starter/starter_test.cc

diff --git a/aos/starter/starter_test.cc b/aos/starter/starter_test.cc
index 935c591..fafeb77 100644
--- a/aos/starter/starter_test.cc
+++ b/aos/starter/starter_test.cc
@@ -5,13 +5,17 @@
 
 #include "aos/events/ping_generated.h"
 #include "aos/events/pong_generated.h"
+#include "aos/testing/path.h"
 #include "aos/testing/tmpdir.h"
 #include "gtest/gtest.h"
 #include "starter_rpc_lib.h"
 #include "starterd_lib.h"
 
+using aos::testing::ArtifactPath;
+
 TEST(StarterdTest, StartStopTest) {
-  const std::string config_file = "aos/events/pingpong_config.json";
+  const std::string config_file =
+      ArtifactPath("aos/events/pingpong_config.json");
 
   aos::FlatbufferDetachedBuffer<aos::Configuration> config =
       aos::configuration::ReadConfig(config_file);
@@ -23,16 +27,17 @@
                              R"({"applications": [
                                   {
                                     "name": "ping",
-                                    "executable_name": "aos/events/ping",
+                                    "executable_name": "%s",
                                     "args": ["--shm_base", "%s/aos"]
                                   },
                                   {
                                     "name": "pong",
-                                    "executable_name": "aos/events/pong",
+                                    "executable_name": "%s",
                                     "args": ["--shm_base", "%s/aos"]
                                   }
                                 ]})",
-                             test_dir, test_dir));
+                             ArtifactPath("aos/events/ping"), test_dir,
+                             ArtifactPath("aos/events/pong"), test_dir));
 
   const aos::Configuration *config_msg = &new_config.message();
 
@@ -108,7 +113,8 @@
 }
 
 TEST(StarterdTest, DeathTest) {
-  const std::string config_file = "aos/events/pingpong_config.json";
+  const std::string config_file =
+      ArtifactPath("aos/events/pingpong_config.json");
 
   aos::FlatbufferDetachedBuffer<aos::Configuration> config =
       aos::configuration::ReadConfig(config_file);
@@ -120,16 +126,17 @@
                              R"({"applications": [
                                   {
                                     "name": "ping",
-                                    "executable_name": "aos/events/ping",
+                                    "executable_name": "%s",
                                     "args": ["--shm_base", "%s/aos"]
                                   },
                                   {
                                     "name": "pong",
-                                    "executable_name": "aos/events/pong",
+                                    "executable_name": "%s",
                                     "args": ["--shm_base", "%s/aos"]
                                   }
                                 ]})",
-                             test_dir, test_dir));
+                             ArtifactPath("aos/events/ping"), test_dir,
+                             ArtifactPath("aos/events/pong"), test_dir));
 
   const aos::Configuration *config_msg = &new_config.message();