From 5ffcc7862abfdcf9df1fcd87d4a8eef6ca8bc531 Mon Sep 17 00:00:00 2001
From: Zev Goldstein <zevdg@google.com>
Date: Thu, 8 Sep 2022 17:51:13 -0400
Subject: [PATCH] re-apply PR #232 to v2

---
 v2/aetest/instance.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/v2/aetest/instance.go b/v2/aetest/instance.go
index 985a52cc..994bec64 100644
--- a/v2/aetest/instance.go
+++ b/v2/aetest/instance.go
@@ -231,6 +231,11 @@ func (i *instance) startChild() (err error) {
 		return err
 	}
 
+	datastorePath := os.Getenv("APPENGINE_DEV_APPSERVER_DATASTORE_PATH")
+	if len(datastorePath) == 0 {
+		datastorePath = filepath.Join(i.appDir, "datastore")
+	}
+
 	appserverArgs = append(appserverArgs,
 		"--port=0",
 		"--api_port=0",
@@ -239,7 +244,7 @@ func (i *instance) startChild() (err error) {
 		"--skip_sdk_update_check=true",
 		"--clear_datastore=true",
 		"--clear_search_indexes=true",
-		"--datastore_path", filepath.Join(i.appDir, "datastore"),
+		"--datastore_path", datastorePath,
 	)
 	if i.opts != nil && i.opts.StronglyConsistentDatastore {
 		appserverArgs = append(appserverArgs, "--datastore_consistency_policy=consistent")