Fixed build and linting issues

Open-CMSIS-Pack · Jul 3, 2024 · 17c4e7b · 17c4e7b
1 parent 6098914
commit 17c4e7b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/pkg/builder/csolution/builder_test.go b/pkg/builder/csolution/builder_test.go
@@ -7,7 +7,6 @@
 package csolution
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -528,7 +527,7 @@ func TestIsProjectMoved(t *testing.T) {
 		_ = os.RemoveAll(tmpDirPath)
 		_ = os.MkdirAll(tmpDirPath, os.ModePerm)
 		cmakeCacheFile := filepath.Join(tmpDirPath, "CMakeCache.txt")
-		_ = ioutil.WriteFile(cmakeCacheFile, []byte(content), 0644)
+		_ = os.WriteFile(cmakeCacheFile, []byte(content), 0644)
 	}
 
 	t.Run("test cache file not found", func(t *testing.T) {
@@ -594,7 +593,7 @@ func TestNeedRebuild(t *testing.T) {
 		_ = os.RemoveAll(tmpDir)
 		_ = os.MkdirAll(tmpDir, os.ModePerm)
 		cmakeCacheFile := filepath.Join(tmpDir, "CMakeCache.txt")
-		_ = ioutil.WriteFile(cmakeCacheFile, []byte(content), 0644)
+		_ = os.WriteFile(cmakeCacheFile, []byte(content), 0644)
 
 		rebuild, err := b.needRebuild()
 		assert.Nil(err)
@@ -610,7 +609,7 @@ func TestNeedRebuild(t *testing.T) {
 		_ = os.RemoveAll(tmpDir)
 		_ = os.MkdirAll(tmpDir, os.ModePerm)
 		cmakeCacheFile := filepath.Join(tmpDir, "CMakeCache.txt")
-		_ = ioutil.WriteFile(cmakeCacheFile, []byte(content), 0644)
+		_ = os.WriteFile(cmakeCacheFile, []byte(content), 0644)
 
 		rebuild, err := b.needRebuild()
 		assert.Nil(err)

diff --git a/test/data/Rebuild.cbuild-idx.yml b/test/data/Rebuild.cbuild-idx.yml
@@ -0,0 +1,23 @@
+build-idx:
+  generated-by: csolution 1.4.0
+  cdefault: HelloWorld.cdefault.yml
+  csolution: HelloWorld.csolution.yml
+  cprojects:
+    - cproject: cm0plus/HelloWorld_cm0plus.cproject.yml
+    - cproject: cm4/HelloWorld_cm4.cproject.yml
+  licenses: test123
+  cbuilds:
+    - cbuild: cm0plus/HelloWorld_cm0plus.Debug+FRDM-K32L3A6.cbuild.yml
+      project: HelloWorld_cm0plus
+      configuration: .Debug+FRDM-K32L3A6
+      rebuild: true
+    - cbuild: cm0plus/HelloWorld_cm0plus.Release+FRDM-K32L3A6.cbuild.yml
+      project: HelloWorld_cm0plus
+      configuration: .Release+FRDM-K32L3A6
+    - cbuild: cm4/HelloWorld_cm4.Debug+FRDM-K32L3A6.cbuild.yml
+      project: HelloWorld_cm4
+      configuration: .Debug+FRDM-K32L3A6
+    - cbuild: cm4/HelloWorld_cm4.Release+FRDM-K32L3A6.cbuild.yml
+      project: HelloWorld_cm4
+      configuration: .Release+FRDM-K32L3A6
+      rebuild: true