e4c38fd245
Update the compiler and linker flags for RHEL 9 by keeping '-trimpath'.
Switch to using the GO_BUILDTAGS and GO_LDFLAGS environment variables,
because their unprefixed counterparts have been deprecated [1].
The 'rpminspect --tests=elf' test run by the downstream CI was silenced
because toolbox(1) is only built with the '-z relro' linker flag, but
not '-z now' [2]. Otherwise, it fails with:
/usr/bin/toolbox lost full GNU_RELRO security protection
Stop carrying the downstream patch for the compiler and linker flags for
PPC64. The architecture was already discontinued from Fedora 29 [3],
even before the patch was added [4]. It was added purely for the sake
of completeness, and in the last four years since it was introduced, it
hasn't been tested or used. At this point it's becoming too much of a
maintenance burden, and removing it silences the %ifarch-applied-patch
warning from rpmlint.
Fill in some of the missing Requires for the toolbox-tests sub-package.
[1] go-rpm-macros commit bc7e5cc55c4709e8
https://pagure.io/go-rpm-macros/c/bc7e5cc55c4709e8
[2] Upstream commit 83f28c52e47c2d44
https://github.com/containers/toolbox/commit/83f28c52e47c2d44
https://github.com/containers/toolbox/pull/1548
[3] https://fedoraproject.org/wiki/Changes/DiscontinuePPC64
[4] Fedora toolbox commit ba60453d21
https://src.fedoraproject.org/rpms/toolbox/c/ba60453d216a9226
https://src.fedoraproject.org/rpms/toolbox/pull-request/2
Resolves: RHEL-61578
105 lines
3.1 KiB
Diff
105 lines
3.1 KiB
Diff
From c25ad44b7cb50d470b1533931b7808cc194f0d50 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
|
Date: Wed, 18 Aug 2021 17:55:21 +0200
|
|
Subject: [PATCH 1/2] cmd/run: Make sosreport work by setting the HOST
|
|
environment variable
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1940037
|
|
---
|
|
src/cmd/run.go | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/cmd/run.go b/src/cmd/run.go
|
|
index 719c0d6abb20..92a097283f38 100644
|
|
--- a/src/cmd/run.go
|
|
+++ b/src/cmd/run.go
|
|
@@ -566,6 +566,7 @@ func constructExecArgs(container, preserveFDs string,
|
|
execArgs = append(execArgs, envOptions...)
|
|
|
|
execArgs = append(execArgs, []string{
|
|
+ "--env", "HOST=/run/host",
|
|
"--interactive",
|
|
"--preserve-fds", preserveFDs,
|
|
}...)
|
|
--
|
|
2.46.1
|
|
|
|
|
|
From e7877a4d1d38dc35aa6da6c012ec9a23397b7aa4 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
|
Date: Fri, 10 Dec 2021 13:42:15 +0100
|
|
Subject: [PATCH 2/2] test/system: Update to test the migration path for
|
|
coreos/toolbox users
|
|
|
|
This reverts the changes to the tests made in commit
|
|
411147988b730dabf8b9e761a5426e12d648f008 by restoring commit
|
|
ca899c8a561f357ae32c6ba6813520fd8b682abb and the parts of commit
|
|
3aeb7cf288319e35eb9c5e26ea18d97452462c1e that were removed.
|
|
---
|
|
test/system/002-help.bats | 14 --------------
|
|
test/system/100-root.bats | 27 +++++++++++++++++++++++++++
|
|
2 files changed, 27 insertions(+), 14 deletions(-)
|
|
create mode 100644 test/system/100-root.bats
|
|
|
|
diff --git a/test/system/002-help.bats b/test/system/002-help.bats
|
|
index a8bfbc2c79d2..5dd14025ea0b 100644
|
|
--- a/test/system/002-help.bats
|
|
+++ b/test/system/002-help.bats
|
|
@@ -33,20 +33,6 @@ teardown() {
|
|
cleanup_all
|
|
}
|
|
|
|
-@test "help: Smoke test" {
|
|
- run --keep-empty-lines --separate-stderr "$TOOLBX"
|
|
-
|
|
- assert_failure
|
|
- assert [ ${#lines[@]} -eq 0 ]
|
|
- lines=("${stderr_lines[@]}")
|
|
- assert_line --index 0 "Error: missing command"
|
|
- assert_line --index 2 "create Create a new Toolbx container"
|
|
- assert_line --index 3 "enter Enter an existing Toolbx container"
|
|
- assert_line --index 4 "list List all existing Toolbx containers and images"
|
|
- assert_line --index 6 "Run 'toolbox --help' for usage."
|
|
- assert [ ${#stderr_lines[@]} -eq 7 ]
|
|
-}
|
|
-
|
|
@test "help: Command 'help'" {
|
|
if ! command -v man 2>/dev/null; then
|
|
skip "not found man(1)"
|
|
diff --git a/test/system/100-root.bats b/test/system/100-root.bats
|
|
new file mode 100644
|
|
index 000000000000..cf35d60ac25c
|
|
--- /dev/null
|
|
+++ b/test/system/100-root.bats
|
|
@@ -0,0 +1,27 @@
|
|
+#!/usr/bin/env bats
|
|
+
|
|
+load 'libs/bats-support/load'
|
|
+load 'libs/bats-assert/load'
|
|
+load 'libs/helpers'
|
|
+
|
|
+setup() {
|
|
+ _setup_environment
|
|
+ cleanup_all
|
|
+}
|
|
+
|
|
+teardown() {
|
|
+ cleanup_all
|
|
+}
|
|
+
|
|
+@test "root: Try to enter the default container with no containers created" {
|
|
+ run "$TOOLBX" <<< "n"
|
|
+
|
|
+ assert_success
|
|
+ assert_line --index 0 "No toolbox containers found. Create now? [y/N] A container can be created later with the 'create' command."
|
|
+ assert_line --index 1 "Run 'toolbox --help' for usage."
|
|
+}
|
|
+
|
|
+# TODO: Write the test
|
|
+@test "root: Enter the default container when 1 non-default container is present" {
|
|
+ skip "Testing of entering toolboxes is not implemented"
|
|
+}
|
|
--
|
|
2.46.1
|
|
|