Extend serve-many test to also use non-top-level export targets

2 files changed, 34 insertions, 9 deletions

diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index 180d8133..18941f83 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -157,13 +157,19 @@
   { "type": "install"
   , "files": {"ROOT": "data/ROOT", "TARGETS": "data/targets/TARGETS.transform"}
   }
+, "serve-many-targets (data in module)":
+  { "type": "install"
+  , "files":
+    {"ROOT": "data/ROOT", "module/TARGETS": "data/targets/TARGETS.transform"}
+  }
 , "serve-many-targets":
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-many-targets"]
   , "test": ["serve_many_targets.sh"]
   , "deps":
     [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
-  , "repos": ["serve-many-targets (data)"]
+  , "repos":
+    ["serve-many-targets (data)", "serve-many-targets (data in module)"]
   }
 , "deduplication-of-serve-requests":
   { "type": ["end-to-end", "with serve"]
diff --git a/test/end-to-end/serve-service/serve_many_targets.sh b/test/end-to-end/serve-service/serve_many_targets.sh
index c5da4606..fa3cf1fa 100644
--- a/test/end-to-end/serve-service/serve_many_targets.sh
+++ b/test/end-to-end/serve-service/serve_many_targets.sh
@@ -29,6 +29,22 @@ fi
 mkdir work
 cd work
 touch ROOT
+for repo in 0 1
+do
+
+if [ "$repo" -eq 0 ]
+then
+    COMMIT="${COMMIT_0}"
+    MODULE=""
+else
+    COMMIT="${COMMIT_1}"
+    MODULE="module"
+fi
+echo
+echo Testing module "\"$MODULE\"" on commit $COMMIT
+echo ==============
+echo
+
 cat > repos.json <<EOF
 { "repositories":
   { "":
@@ -38,7 +54,7 @@ cat > repos.json <<EOF
   , "transform":
     { "repository":
       { "type": "git"
-      , "commit": "$COMMIT_0"
+      , "commit": "$COMMIT"
       , "pragma": {"absent": true}
       , "repository": "http://non-existent.example.org/data.git"
       , "branch": "master"
@@ -49,43 +65,44 @@ cat > repos.json <<EOF
 EOF
 cat repos.json
 
-cat > TARGETS <<'EOF'
+cat > TARGETS <<EOF
 { "":
   { "type": "install"
   , "files": {"a": "a", "b": "b", "c": "c", "d": "d", "e": "e", "f": "f"}
   }
 , "a":
   { "type": "configure"
-  , "target": ["@", "transform", "", ""]
+  , "target": ["@", "transform", "$MODULE", ""]
   , "config": {"type": "singleton_map", "key": "DATA", "value": "a"}
   }
 , "b":
   { "type": "configure"
-  , "target": ["@", "transform", "", ""]
+  , "target": ["@", "transform", "$MODULE", ""]
   , "config": {"type": "singleton_map", "key": "DATA", "value": "b"}
   }
 , "c":
   { "type": "configure"
-  , "target": ["@", "transform", "", ""]
+  , "target": ["@", "transform", "$MODULE", ""]
   , "config": {"type": "singleton_map", "key": "DATA", "value": "c"}
   }
 , "d":
   { "type": "configure"
-  , "target": ["@", "transform", "", ""]
+  , "target": ["@", "transform", "$MODULE", ""]
   , "config": {"type": "singleton_map", "key": "DATA", "value": "d"}
   }
 , "e":
   { "type": "configure"
-  , "target": ["@", "transform", "", ""]
+  , "target": ["@", "transform", "$MODULE", ""]
   , "config": {"type": "singleton_map", "key": "DATA", "value": "e"}
   }
 , "f":
   { "type": "configure"
-  , "target": ["@", "transform", "", ""]
+  , "target": ["@", "transform", "$MODULE", ""]
   , "config": {"type": "singleton_map", "key": "DATA", "value": "f"}
   }
 }
 EOF
+cat TARGETS
 
 "${JUST_MR}" --norc --local-build-root "${LBR}" --just "${JUST}" \
              -R "${SERVE}" -r "${REMOTE_EXECUTION_ADDRESS}" ${COMPAT} \
@@ -98,4 +115,6 @@ EOF
 [ "$(cat "${OUT}/e")" = "EEE" ]
 [ "$(cat "${OUT}/f")" = "FFF" ]
 
+done
+
 echo OK