From 50e587f447a1b0b43154a9beb05909eca28fdb77 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 30 Oct 2023 13:16:47 +0100
Subject: [PATCH] test: new test, verify env:file variable expansion

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 test/Makefile.am  |  2 ++
 test/skel/etc/env |  2 ++
 test/svc-env.sh   | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100755 test/svc-env.sh

diff --git a/test/Makefile.am b/test/Makefile.am
index 7c30122e..bfe9b747 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST		+= crashing.sh
 EXTRA_DIST		+= depserv.sh
 EXTRA_DIST		+= devmon.sh
 EXTRA_DIST		+= failing-sysv.sh
+EXTRA_DIST		+= svc-env.sh
 EXTRA_DIST		+= global-envs.sh
 EXTRA_DIST		+= initctl-status-subset.sh
 EXTRA_DIST		+= notify.sh
@@ -76,6 +77,7 @@ TESTS			+= crashing.sh
 TESTS			+= depserv.sh
 TESTS			+= devmon.sh
 TESTS			+= failing-sysv.sh
+TESTS			+= svc-env.sh
 TESTS			+= global-envs.sh
 TESTS			+= initctl-status-subset.sh
 TESTS			+= notify.sh
diff --git a/test/skel/etc/env b/test/skel/etc/env
index 9ad45095..f3a942f7 100644
--- a/test/skel/etc/env
+++ b/test/skel/etc/env
@@ -3,3 +3,5 @@
 
 foo=bar
 baz=qux
+
+xyzzy=$foo
diff --git a/test/svc-env.sh b/test/svc-env.sh
new file mode 100755
index 00000000..366f7f2e
--- /dev/null
+++ b/test/svc-env.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Ensure service environment variables are sourced and expanded properly.
+set -e
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+    say "Test start $(date)"
+}
+
+test_teardown()
+{
+    say "Test done $(date)"
+
+    say "Running test teardown."
+    run "rm -f $FINIT_CONF"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
+sep "/etc/env:"
+run "cat /etc/env"
+run "echo 'service env:/etc/env serv -np -e xyzzy:bar -- serv checks xyzzy=bar' > $FINIT_CONF"
+
+say 'Reload Finit'
+run "initctl reload"
+
+retry 'assert_num_children 1 serv'
+
+say "Done, drop service from $FINIT_CONF ..."
+run "rm $FINIT_CONF"
+run "initctl reload"