diff options
author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-04-25 10:08:04 +0200 |
---|---|---|
committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-04-25 15:06:04 +0200 |
commit | 6220355db107942f805eef09d9dd3b399f9b0c72 (patch) | |
tree | 6b0c97537ab538fee3c3a5ba01c8de3919c364fc /test/end-to-end/serve-service | |
parent | 4b05b3faefe25f284909ca24b30180fa86aa172e (diff) | |
download | justbuild-6220355db107942f805eef09d9dd3b399f9b0c72.tar.gz |
just serve: Paths in config file should be location objects
Also updates the tests and all relevant documentation accordingly.
Diffstat (limited to 'test/end-to-end/serve-service')
-rw-r--r-- | test/end-to-end/serve-service/serve_start_execute.sh | 7 | ||||
-rw-r--r-- | test/end-to-end/serve-service/serve_start_execute_sharding.sh | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/test/end-to-end/serve-service/serve_start_execute.sh b/test/end-to-end/serve-service/serve_start_execute.sh index 1c405d07..c9ebffba 100644 --- a/test/end-to-end/serve-service/serve_start_execute.sh +++ b/test/end-to-end/serve-service/serve_start_execute.sh @@ -34,8 +34,11 @@ readonly PIDFILE="${PWD}/pid.txt" COMPAT="" cat > .just-servec <<EOF { "repositories": [] -, "remote service": {"info file": "${INFOFILE}", "pid file": "${PIDFILE}"} -, "local build root": "${LBR}" +, "remote service": + { "info file": {"root": "system", "path": "${INFOFILE}"} + , "pid file": {"root": "system", "path": "${PIDFILE}"} + } +, "local build root": {"root": "system", "path": "${LBR}"} EOF if [ "${COMPATIBLE:-}" = "YES" ] then diff --git a/test/end-to-end/serve-service/serve_start_execute_sharding.sh b/test/end-to-end/serve-service/serve_start_execute_sharding.sh index d6486841..6997c612 100644 --- a/test/end-to-end/serve-service/serve_start_execute_sharding.sh +++ b/test/end-to-end/serve-service/serve_start_execute_sharding.sh @@ -115,8 +115,11 @@ ls -R "${SERVE_LBR}" # cat > .just-servec <<EOF { "repositories": [] -, "remote service": {"info file": "${INFOFILE}", "pid file": "${PIDFILE}"} -, "local build root": "${SERVE_LBR}" +, "remote service": + { "info file": {"root": "system", "path": "${INFOFILE}"} + , "pid file": {"root": "system", "path": "${PIDFILE}"} + } +, "local build root": {"root": "system", "path": "${SERVE_LBR}"} } EOF echo "Serve service configuration:" |