Differential D13204 Diff 32270 files/0001-os-test-Solus-uses-usr-bin-hostname-conform-and-don-.patch

Changeset View

Standalone View

files/0001-os-test-Solus-uses-usr-bin-hostname-conform-and-don-.patch

	From 7d3624e8e3e71b20af9c0a5d3110cd6f11dde0eb Mon Sep 17 00:00:00 2001			From 29426e6ba7c162d488dc56d597b18af49976ecca Mon Sep 17 00:00:00 2001
	From: Joshua Strobl <joshua@streambits.io>			From: Joshua Strobl <joshua@streambits.io>
	Date: Tue, 16 Feb 2021 23:27:07 +0200			Date: Tue, 16 Feb 2021 23:27:07 +0200
	Subject: [PATCH 1/1] os-test: Solus uses /usr/bin/hostname, conform and don't			Subject: [PATCH] os-test: Solus uses /usr/bin/hostname, conform and don't fail
	fail

	---			---
	src/os/os_test.go \| 4 ++--			src/os/os_test.go \| 4 ++--
	1 file changed, 2 insertions(+), 2 deletions(-)			1 file changed, 2 insertions(+), 2 deletions(-)

	diff --git a/src/os/os_test.go b/src/os/os_test.go			diff --git a/src/os/os_test.go b/src/os/os_test.go
	index a32e5fc..63016af 100644			index 63427deb6e..e3e61d956f 100644
	--- a/src/os/os_test.go			--- a/src/os/os_test.go
	+++ b/src/os/os_test.go			+++ b/src/os/os_test.go
	@@ -1692,7 +1692,7 @@ func runBinHostname(t *testing.T) string {			@@ -1676,7 +1676,7 @@ func runBinHostname(t *testing.T) string {
	t.Fatal(err)			t.Fatal(err)
	}			}
	defer r.Close()			defer r.Close()
	- const path = "/bin/hostname"			- const path = "/bin/hostname"
	+ const path = "/usr/bin/hostname"			+ const path = "/usr/bin/hostname"
	argv := []string{"hostname"}			argv := []string{"hostname"}
	if runtime.GOOS == "aix" {			if runtime.GOOS == "aix" {
	argv = []string{"hostname", "-s"}			argv = []string{"hostname", "-s"}
	@@ -1721,7 +1721,7 @@ func runBinHostname(t *testing.T) string {			@@ -1705,7 +1705,7 @@ func runBinHostname(t *testing.T) string {
	output = output[0 : n-1]			output = output[0 : n-1]
	}			}
	if output == "" {			if output == "" {
	- t.Fatalf("/bin/hostname produced no output")			- t.Fatalf("/bin/hostname produced no output")
	+ t.Fatalf("/usr/bin/hostname produced no output")			+ t.Fatalf("/usr/bin/hostname produced no output")
	}			}

	return output			return output
	--			--
	2.30.0			2.35.1