Skip to content

Commit 40d8cc1

Browse files
committed
BG suite: add multierror output with multiline print
This also rewords many error messages to make them consistent: - capitalize BootGuard, Key Manifest and Boot Policy Manifest - spell out Key Manifest and Boot Policy Manifest - uppercase acronyms such as DMA etc Signed-off-by: Daniel Maslowski <info@orangecms.org>
1 parent 8e176a0 commit 40d8cc1

File tree

6 files changed

+102
-72
lines changed

6 files changed

+102
-72
lines changed

cmd/bg-suite/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (e *execTestsCmd) Run(ctx *context) error {
5151
ret := false
5252
data, err := os.ReadFile(e.Firmware)
5353
if err != nil {
54-
return fmt.Errorf("can't read firmware file")
54+
return fmt.Errorf("can't read firmware file %v", e.Firmware)
5555
}
5656
preset := test.PreSet{
5757
Firmware: data,

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ require (
2929
github.com/xaionaro-go/bytesextra v0.0.0-20220103144954-846e454ddea9
3030
github.com/xaionaro-go/unhash v0.0.0-20230427202706-0195a574c620
3131
github.com/xaionaro-go/unsafetools v0.0.0-20210722164218-75ba48cf7b3c
32+
go.uber.org/multierr v1.11.0
3233
golang.org/x/crypto v0.17.0
3334
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
3435
gopkg.in/yaml.v3 v3.0.1

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
557557
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
558558
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
559559
go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
560+
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
561+
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
560562
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
561563
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
562564
go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=

0 commit comments

Comments
 (0)