Cleanup

Open-CMSIS-Pack · May 9, 2023 · 0a3ec50 · 0a3ec50
1 parent 8ea0f3e
commit 0a3ec50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cmd/cbuild/commands/list/list_environment_test.go b/cmd/cbuild/commands/list/list_environment_test.go
@@ -8,15 +8,13 @@ package list_test
 
 import (
  "cbuild/cmd/cbuild/commands"
- "os"
  "testing"
 
  "github.com/stretchr/testify/assert"
 )
 
 func TestListEnvironmentCommand(t *testing.T) {
  assert := assert.New(t)
- os.Setenv("CMSIS_BUILD_ROOT", testRoot+"/run/bin")
 
  t.Run("invalid args", func(t *testing.T) {
  cmd := commands.NewRootCmd()
@@ -34,7 +32,7 @@ func TestListEnvironmentCommand(t *testing.T) {
 
  t.Run("test help", func(t *testing.T) {
  cmd := commands.NewRootCmd()
- cmd.SetArgs([]string{"list", "toolchains", "-h"})
+ cmd.SetArgs([]string{"list", "environment", "-h"})
  err := cmd.Execute()
  assert.Nil(err)
  })

diff --git a/pkg/builder/csolution/builder.go b/pkg/builder/csolution/builder.go
@@ -303,7 +303,7 @@ func (b CSolutionBuilder) listEnvironment(quiet bool) (envConfigs []string, err
  }
 
  // run "exe --version" command
- versionStr, err := b.Runner.ExecuteCommand(path, false, "--version")
+ versionStr, err := b.Runner.ExecuteCommand(path, true, "--version")
  if err != nil {
  versionStr = ""
  }