[cbuild2cmake support] Handle context-set flag

Open-CMSIS-Pack · Apr 25, 2024 · ed9ca6c · ed9ca6c
1 parent 17a952c
commit ed9ca6c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/builder/cbuildidx/builder.go b/pkg/builder/cbuildidx/builder.go
@@ -159,6 +159,9 @@ func (b CbuildIdxBuilder) Build() error {
 	}
 
 	args := []string{b.InputFile}
+	if b.Options.UseContextSet {
+		args = append(args, "--context-set")
+	}
 	if b.Options.Debug {
 		args = append(args, "--debug")
 		log.Debug("cbuild2cmake command: " + vars.Cbuild2cmakeBin + " " + strings.Join(args, " "))

diff --git a/pkg/builder/cbuildidx/builder_test.go b/pkg/builder/cbuildidx/builder_test.go
@@ -254,6 +254,13 @@ func TestBuildAllContexts(t *testing.T) {
 		assert.Nil(err)
 	})
 
+	t.Run("test build use context set", func(t *testing.T) {
+		b.Options.UseContextSet = true
+		err := b.Build()
+		assert.Nil(err)
+		b.Options.UseContextSet = false
+	})
+
 	t.Run("test setup", func(t *testing.T) {
 		b.Setup = true
 		err := b.Build()