test: Simplify hostname checking

Both hostname and uname utilities boil down to uname(2) syscall. Reduce
tests dependency footprint by using uname for checking hostname too.

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 01bfd2338bbcfb5ad1350786dd6df881bbe5b588..9769b0544741410bc6f21639d0a595fdd767d050 100644 (file)
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -31,7 +31,6 @@ BuildPackages=
         gnu-efi-devel
         gnutls-devel
         gperf
-        hostname
         iptables-devel
         kmod-devel
         libacl-devel

diff --git a/test/test-execute/exec-specifier.service b/test/test-execute/exec-specifier.service
index 7c3f81f2b53fec4bc2294c86708e98c10846260f..a58abc68dd6057e355eb25f63b3648194de7c781 100644 (file)
--- a/test/test-execute/exec-specifier.service
+++ b/test/test-execute/exec-specifier.service
@@ -27,5 +27,5 @@ ExecStart=test %h = /root
 ExecStart=sh -c 'test %s = /bin/sh'
 ExecStart=sh -c 'test %m = $$(cat /etc/machine-id)'
 ExecStart=sh -c 'test %b = $$(cat /proc/sys/kernel/random/boot_id | sed -e 's/-//g')'
-ExecStart=sh -c 'test %H = $$(hostname)'
+ExecStart=sh -c 'test %H = $$(uname -n)'
 ExecStart=sh -c 'test %v = $$(uname -r)'

diff --git a/test/test-execute/exec-specifier@.service b/test/test-execute/exec-specifier@.service
index a388926846a18b8a4cc5f1209d02757c5066ab93..faecbf37bc5965a89caabe47fce13acfb634ec0a 100644 (file)
--- a/test/test-execute/exec-specifier@.service
+++ b/test/test-execute/exec-specifier@.service
@@ -25,5 +25,5 @@ ExecStart=test %h = /root
 ExecStart=sh -c 'test %s = /bin/sh'
 ExecStart=sh -c 'test %m = $$(cat /etc/machine-id)'
 ExecStart=sh -c 'test %b = $$(cat /proc/sys/kernel/random/boot_id | sed -e 's/-//g')'
-ExecStart=sh -c 'test %H = $$(hostname)'
+ExecStart=sh -c 'test %H = $$(uname -n)'
 ExecStart=sh -c 'test %v = $$(uname -r)'