From 98875552f6afa593ffd5d115c2379e47edfddfbf Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Wed, 20 Dec 2023 13:06:09 +0100
Subject: serve tree test: extend to use a separate target root

---
 test/end-to-end/serve-service/TARGETS       |  6 ++----
 test/end-to-end/serve-service/serve-tree.sh | 12 ++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'test/end-to-end/serve-service')

diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index 4783c32a..c8d6ca70 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -56,10 +56,7 @@
     [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
   }
 , "serve-tree (data)":
-  { "type": "install"
-  , "files": {"repo/TARGETS": "data/targets/TARGETS.tree"}
-  , "dirs": [["serve-target-remote-build (repo)", "repo"]]
-  }
+  {"type": "install", "dirs": [["serve-target-remote-build (repo)", "repo"]]}
 , "serve-tree (archive)":
   { "type": "generic"
   , "outs": ["src.tar"]
@@ -74,6 +71,7 @@
     [ ["end-to-end", "mr-tool-under-test"]
     , ["end-to-end", "tool-under-test"]
     , "serve-tree (archive)"
+    , "data/targets/TARGETS.tree"
     ]
   , "repos": ["serve-tree (archive)"]
   }
diff --git a/test/end-to-end/serve-service/serve-tree.sh b/test/end-to-end/serve-service/serve-tree.sh
index 97e287cc..0007f920 100755
--- a/test/end-to-end/serve-service/serve-tree.sh
+++ b/test/end-to-end/serve-service/serve-tree.sh
@@ -24,6 +24,8 @@ readonly LBR_C="${TEST_TMPDIR}/build-root-C"
 readonly LBR_D="${TEST_TMPDIR}/build-root-D"
 readonly DISTDIR="${TEST_TMPDIR}/distfiles"
 
+readonly TARGET_ROOT="${PWD}/data/targets"
+
 mkdir -p "${DISTDIR}"
 cp src.tar "${DISTDIR}"
 HASH=$(git hash-object src.tar)
@@ -43,6 +45,12 @@ cat > repos.json <<EOF
       , "fetch": "http://example.org/src.tar"
       , "subdir": "repo"
       }
+    , "target_root": "targets"
+    , "target_file_name": "TARGETS.tree"
+    }
+  , "targets":
+    { "repository":
+      {"type": "file", "path": "${TARGET_ROOT}", "pragma": {"to_git": true}}
     }
   }
 }
@@ -61,18 +69,21 @@ echo
 echo Local build
 "${JUST_MR}" --norc --local-build-root "${LBR_A}" --just "${JUST}" \
              --distdir "${DISTDIR}" build \
+             --log-limit 4 \
              --dump-artifacts local.json 2>&1
 
 echo
 echo Remote build
 "${JUST_MR}" --norc --local-build-root "${LBR_B}" --just "${JUST}" \
              --distdir "${DISTDIR}" ${REMOTE} build \
+             --log-limit 4 \
              --dump-artifacts remote.json 2>&1
 
 echo
 echo Serve build
 "${JUST_MR}" --norc --local-build-root "${LBR_C}" --just "${JUST}" \
              ${REMOTE} -R ${SERVE} build \
+             --log-limit 4 \
              --dump-artifacts serve.json 2>&1
 
 echo
@@ -80,6 +91,7 @@ echo Absent build
 echo -n '[""]' > abs
 "${JUST_MR}" --norc --local-build-root "${LBR_D}" --just "${JUST}" \
              --distdir "${DISTDIR}" ${REMOTE} -R ${SERVE} --absent abs build \
+             --log-limit 4 \
              --dump-artifacts absent.json 2>&1
 
 diff -u local.json remote.json
-- 
cgit v1.2.3