Source files were recursively collected despite target library was layout was

Federico Fissore · Federico Fissore · commit d89b51e02135 · 2015-11-02T10:17:06.000+01:00
FLAT. Fixes #41 Signed-off-by: Federico Fissore <f.fissore@arduino.cc>
diff --git a/src/arduino.cc/builder/add_additional_entries_to_context.go b/src/arduino.cc/builder/add_additional_entries_to_context.go
@@ -82,7 +82,7 @@ func (s *AddAdditionalEntriesToContext) Run(context map[string]interface{}) erro
 
 	sourceFiles := &types.UniqueStringQueue{}
 	context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE] = sourceFiles
-	foldersWithSources := &types.UniqueStringQueue{}
+	foldersWithSources := &types.UniqueSourceFolderQueue{}
 	context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE] = foldersWithSources
 
 	context[constants.CTX_LIBRARY_RESOLUTION_RESULTS] = make(map[string]types.LibraryResolutionResult)
diff --git a/src/arduino.cc/builder/collect_all_source_files_from_folders_with_sources.go b/src/arduino.cc/builder/collect_all_source_files_from_folders_with_sources.go
@@ -34,21 +34,27 @@ import (
 	"arduino.cc/builder/gohasissues"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
 )
 
 type CollectAllSourceFilesFromFoldersWithSources struct{}
 
 func (s *CollectAllSourceFilesFromFoldersWithSources) Run(context map[string]interface{}) error {
-	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue)
+	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue)
 	sourceFiles := context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue)
 
 	filePaths := []string{}
 	for !foldersWithSources.Empty() {
-		checkExtensionFunc := func(ext string) bool {
-			return ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS[ext]
+		sourceFolder := foldersWithSources.Pop().(types.SourceFolder)
+		var err error
+		if sourceFolder.Recurse {
+			err = collectByWalk(&filePaths, sourceFolder.Folder)
+		} else {
+			err = collectByReadDir(&filePaths, sourceFolder.Folder)
 		}
-		walkFunc := utils.CollectAllReadableFiles(&filePaths, checkExtensionFunc)
-		err := gohasissues.Walk(foldersWithSources.Pop().(string), walkFunc)
 		if err != nil {
 			return utils.WrapError(err)
 		}
@@ -60,3 +66,30 @@ func (s *CollectAllSourceFilesFromFoldersWithSources) Run(context map[string]int
 
 	return nil
 }
+
+func collectByWalk(filePaths *[]string, folder string) error {
+	checkExtensionFunc := func(ext string) bool {
+		return ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS[ext]
+	}
+	walkFunc := utils.CollectAllReadableFiles(filePaths, checkExtensionFunc)
+	err := gohasissues.Walk(folder, walkFunc)
+	return utils.WrapError(err)
+}
+
+func collectByReadDir(filePaths *[]string, folder string) error {
+	if _, err := os.Stat(folder); err != nil && os.IsNotExist(err) {
+		return nil
+	}
+
+	files, err := ioutil.ReadDir(folder)
+	if err != nil {
+		return utils.WrapError(err)
+	}
+	for _, file := range files {
+		ext := strings.ToLower(filepath.Ext(file.Name()))
+		if ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS[ext] {
+			*filePaths = append(*filePaths, filepath.Join(folder, file.Name()))
+		}
+	}
+	return nil
+}
diff --git a/src/arduino.cc/builder/container_find_includes.go b/src/arduino.cc/builder/container_find_includes.go
@@ -62,11 +62,14 @@ func (s *ContainerFindIncludes) Run(context map[string]interface{}) error {
 		}
 	}
 
-	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue)
-	foldersWithSources.Push(context[constants.CTX_SKETCH_BUILD_PATH])
+	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue)
+	foldersWithSources.Push(types.SourceFolder{Folder: context[constants.CTX_SKETCH_BUILD_PATH].(string), Recurse: true})
 	if utils.MapHas(context, constants.CTX_IMPORTED_LIBRARIES) {
 		for _, library := range context[constants.CTX_IMPORTED_LIBRARIES].([]*types.Library) {
-			foldersWithSources.Push(library.SrcFolder)
+			sourceFolders := utils.LibraryToSourceFolder(library)
+			for _, sourceFolder := range sourceFolders {
+				foldersWithSources.Push(sourceFolder)
+			}
 		}
 	}
 
diff --git a/src/arduino.cc/builder/includes_to_include_folders.go b/src/arduino.cc/builder/includes_to_include_folders.go
@@ -62,12 +62,15 @@ func (s *IncludesToIncludeFolders) Run(context map[string]interface{}) error {
 		return utils.WrapError(err)
 	}
 
-	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue)
+	foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue)
 
 	for _, newlyImportedLibrary := range newlyImportedLibraries {
 		if !sliceContainsLibrary(importedLibraries, newlyImportedLibrary) {
 			importedLibraries = append(importedLibraries, newlyImportedLibrary)
-			foldersWithSources.Push(newlyImportedLibrary.SrcFolder)
+			sourceFolders := utils.LibraryToSourceFolder(newlyImportedLibrary)
+			for _, sourceFolder := range sourceFolders {
+				foldersWithSources.Push(sourceFolder)
+			}
 		}
 	}
 
diff --git a/src/arduino.cc/builder/test/add_additional_entries_to_context_test.go b/src/arduino.cc/builder/test/add_additional_entries_to_context_test.go
@@ -55,7 +55,7 @@ func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) {
 	require.NotNil(t, context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH])
 
 	require.True(t, context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue).Empty())
-	require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue).Empty())
+	require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue).Empty())
 
 	require.Equal(t, 0, len(context[constants.CTX_LIBRARY_RESOLUTION_RESULTS].(map[string]types.LibraryResolutionResult)))
 }
@@ -79,7 +79,7 @@ func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) {
 	require.NotNil(t, context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH])
 
 	require.True(t, context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue).Empty())
-	require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue).Empty())
+	require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue).Empty())
 
 	require.Equal(t, 0, len(context[constants.CTX_LIBRARY_RESOLUTION_RESULTS].(map[string]types.LibraryResolutionResult)))
 }
diff --git a/src/arduino.cc/builder/test/builder_test.go b/src/arduino.cc/builder/test/builder_test.go
@@ -292,3 +292,24 @@ func TestBuilderSketchWithBackup(t *testing.T) {
 	err := command.Run(context)
 	NoError(t, err)
 }
+
+func TestBuilderSketchWithOldLib(t *testing.T) {
+	DownloadCoresAndToolsAndLibraries(t)
+
+	context := make(map[string]interface{})
+
+	buildPath := SetupBuildPath(t, context)
+	defer os.RemoveAll(buildPath)
+
+	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"}
+	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools"}
+	context[constants.CTX_FQBN] = "arduino:avr:uno"
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch_with_old_lib", "sketch.ino")
+	context[constants.CTX_BUILT_IN_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
+	context[constants.CTX_OTHER_LIBRARIES_FOLDERS] = []string{"libraries"}
+	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+
+	command := builder.Builder{}
+	err := command.Run(context)
+	NoError(t, err)
+}
diff --git a/src/arduino.cc/builder/test/collect_all_source_files_from_folders_with_sources_test.go b/src/arduino.cc/builder/test/collect_all_source_files_from_folders_with_sources_test.go
@@ -44,8 +44,8 @@ func TestCollectAllSourceFilesFromFoldersWithSources(t *testing.T) {
 
 	sourceFiles := &types.UniqueStringQueue{}
 	context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE] = sourceFiles
-	foldersWithSources := &types.UniqueStringQueue{}
-	foldersWithSources.Push(Abs(t, "sketch_with_config"))
+	foldersWithSources := &types.UniqueSourceFolderQueue{}
+	foldersWithSources.Push(types.SourceFolder{Folder: Abs(t, "sketch_with_config"), Recurse: true})
 	context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE] = foldersWithSources
 
 	commands := []types.Command{
@@ -71,8 +71,8 @@ func TestCollectAllSourceFilesFromFoldersWithSourcesOfLibrary(t *testing.T) {
 
 	sourceFiles := &types.UniqueStringQueue{}
 	context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE] = sourceFiles
-	foldersWithSources := &types.UniqueStringQueue{}
-	foldersWithSources.Push(Abs(t, filepath.Join("downloaded_libraries", "Bridge")))
+	foldersWithSources := &types.UniqueSourceFolderQueue{}
+	foldersWithSources.Push(types.SourceFolder{Folder: Abs(t, filepath.Join("downloaded_libraries", "Bridge")), Recurse: true})
 	context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE] = foldersWithSources
 
 	commands := []types.Command{
@@ -100,3 +100,33 @@ func TestCollectAllSourceFilesFromFoldersWithSourcesOfLibrary(t *testing.T) {
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Process.cpp")), sourceFiles.Pop())
 	require.Equal(t, 0, len(*sourceFiles))
 }
+
+func TestCollectAllSourceFilesFromFoldersWithSourcesOfOldLibrary(t *testing.T) {
+	context := make(map[string]interface{})
+
+	sourceFiles := &types.UniqueStringQueue{}
+	context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE] = sourceFiles
+	foldersWithSources := &types.UniqueSourceFolderQueue{}
+	foldersWithSources.Push(types.SourceFolder{Folder: Abs(t, filepath.Join("libraries", "ShouldNotRecurseWithOldLibs")), Recurse: false})
+	foldersWithSources.Push(types.SourceFolder{Folder: Abs(t, filepath.Join("libraries", "ShouldNotRecurseWithOldLibs", "utility")), Recurse: false})
+	foldersWithSources.Push(types.SourceFolder{Folder: Abs(t, "non existent folder"), Recurse: false})
+	context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE] = foldersWithSources
+
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+		&builder.CollectAllSourceFilesFromFoldersWithSources{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
+
+	require.Equal(t, 2, len(*sourceFiles))
+	require.Equal(t, 0, len(*foldersWithSources))
+	sort.Strings(*sourceFiles)
+
+	require.Equal(t, Abs(t, filepath.Join("libraries", "ShouldNotRecurseWithOldLibs", "ShouldNotRecurseWithOldLibs.cpp")), sourceFiles.Pop())
+	require.Equal(t, Abs(t, filepath.Join("libraries", "ShouldNotRecurseWithOldLibs", "utility", "utils.cpp")), sourceFiles.Pop())
+	require.Equal(t, 0, len(*sourceFiles))
+}
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.cpp b/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.cpp
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.h b/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/ShouldNotRecurseWithOldLibs.h
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/doc/error.cpp b/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/doc/error.cpp
@@ -0,0 +1 @@
+ #error "This file is never supposed to be compiled"
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.cpp b/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.cpp
diff --git a/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.h b/src/arduino.cc/builder/test/libraries/ShouldNotRecurseWithOldLibs/utility/utils.h
diff --git a/src/arduino.cc/builder/test/libraries_loader_test.go b/src/arduino.cc/builder/test/libraries_loader_test.go
@@ -69,7 +69,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
 	require.Equal(t, Abs(t, filepath.Join("libraries")), librariesFolders[2])
 
 	libraries := context[constants.CTX_LIBRARIES].([]*types.Library)
-	require.Equal(t, 15, len(libraries))
+	require.Equal(t, 16, len(libraries))
 
 	sort.Sort(ByLibraryName(libraries))
 
@@ -117,6 +117,8 @@ func TestLoadLibrariesAVR(t *testing.T) {
 	idx++
 	require.Equal(t, "SPI", libraries[idx].Name)
 	idx++
+	require.Equal(t, "ShouldNotRecurseWithOldLibs", libraries[idx].Name)
+	idx++
 	require.Equal(t, "SoftwareSerial", libraries[idx].Name)
 	idx++
 	require.Equal(t, "USBHost", libraries[idx].Name)
@@ -171,7 +173,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
 	require.Equal(t, Abs(t, filepath.Join("libraries")), librariesFolders[2])
 
 	libraries := context[constants.CTX_LIBRARIES].([]*types.Library)
-	require.Equal(t, 13, len(libraries))
+	require.Equal(t, 14, len(libraries))
 
 	sort.Sort(ByLibraryName(libraries))
 
@@ -198,6 +200,8 @@ func TestLoadLibrariesSAM(t *testing.T) {
 	idx++
 	require.Equal(t, "SPI", libraries[idx].Name)
 	idx++
+	require.Equal(t, "ShouldNotRecurseWithOldLibs", libraries[idx].Name)
+	idx++
 	require.Equal(t, "USBHost", libraries[idx].Name)
 	idx++
 	require.Equal(t, "Wire", libraries[idx].Name)
diff --git a/src/arduino.cc/builder/test/sketch_with_old_lib/sketch.ino b/src/arduino.cc/builder/test/sketch_with_old_lib/sketch.ino
@@ -0,0 +1,9 @@
+#include "ShouldNotRecurseWithOldLibs.h"
+
+void setup() {
+
+}
+
+void loop() {
+
+}
diff --git a/src/arduino.cc/builder/types/accessories.go b/src/arduino.cc/builder/types/accessories.go
@@ -31,25 +31,48 @@ package types
 
 type UniqueStringQueue []string
 
-func (h UniqueStringQueue) Len() int           { return len(h) }
-func (h UniqueStringQueue) Less(i, j int) bool { return false }
-func (h UniqueStringQueue) Swap(i, j int)      { panic("Who called me?!?") }
+func (queue UniqueStringQueue) Len() int           { return len(queue) }
+func (queue UniqueStringQueue) Less(i, j int) bool { return false }
+func (queue UniqueStringQueue) Swap(i, j int)      { panic("Who called me?!?") }
 
-func (h *UniqueStringQueue) Push(x interface{}) {
-	if !sliceContains(*h, x.(string)) {
-		*h = append(*h, x.(string))
+func (queue *UniqueStringQueue) Push(value string) {
+	if !sliceContains(*queue, value) {
+		*queue = append(*queue, value)
 	}
 }
 
-func (h *UniqueStringQueue) Pop() interface{} {
-	old := *h
+func (queue *UniqueStringQueue) Pop() interface{} {
+	old := *queue
 	x := old[0]
-	*h = old[1:]
+	*queue = old[1:]
 	return x
 }
 
-func (h *UniqueStringQueue) Empty() bool {
-	return h.Len() == 0
+func (queue *UniqueStringQueue) Empty() bool {
+	return queue.Len() == 0
+}
+
+type UniqueSourceFolderQueue []SourceFolder
+
+func (queue UniqueSourceFolderQueue) Len() int           { return len(queue) }
+func (queue UniqueSourceFolderQueue) Less(i, j int) bool { return false }
+func (queue UniqueSourceFolderQueue) Swap(i, j int)      { panic("Who called me?!?") }
+
+func (queue *UniqueSourceFolderQueue) Push(value SourceFolder) {
+	if !sliceContainsSourceFolder(*queue, value) {
+		*queue = append(*queue, value)
+	}
+}
+
+func (queue *UniqueSourceFolderQueue) Pop() interface{} {
+	old := *queue
+	x := old[0]
+	*queue = old[1:]
+	return x
+}
+
+func (queue *UniqueSourceFolderQueue) Empty() bool {
+	return queue.Len() == 0
 }
 
 type LibraryResolutionResult struct {
diff --git a/src/arduino.cc/builder/types/types.go b/src/arduino.cc/builder/types/types.go
@@ -156,3 +156,8 @@ type Prototype struct {
 	Prototype    string
 	Fields       map[string]string
 }
+
+type SourceFolder struct {
+	Folder  string
+	Recurse bool
+}
diff --git a/src/arduino.cc/builder/types/utils.go b/src/arduino.cc/builder/types/utils.go
@@ -38,3 +38,12 @@ func sliceContains(slice []string, target string) bool {
 	}
 	return false
 }
+
+func sliceContainsSourceFolder(slice []SourceFolder, target SourceFolder) bool {
+	for _, elem := range slice {
+		if elem.Folder == target.Folder {
+			return true
+		}
+	}
+	return false
+}
diff --git a/src/arduino.cc/builder/utils/utils.go b/src/arduino.cc/builder/utils/utils.go
@@ -415,3 +415,14 @@ func AppendIfNotPresent(target []string, elements ...string) []string {
 	}
 	return target
 }
+
+func LibraryToSourceFolder(library *types.Library) []types.SourceFolder {
+	sourceFolders := []types.SourceFolder{}
+	recurse := library.Layout == types.LIBRARY_RECURSIVE
+	sourceFolders = append(sourceFolders, types.SourceFolder{Folder: library.SrcFolder, Recurse: recurse})
+	if library.Layout == types.LIBRARY_FLAT {
+		utility := filepath.Join(library.SrcFolder, constants.LIBRARY_FOLDER_UTILITY)
+		sourceFolders = append(sourceFolders, types.SourceFolder{Folder: utility, Recurse: false})
+	}
+	return sourceFolders
+}

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,14 @@ func (s *ContainerFindIncludes) Run(context map[string]interface{}) error {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue)`
`66`		`- foldersWithSources.Push(context[constants.CTX_SKETCH_BUILD_PATH])`
	`65`	`+ foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue)`
	`66`	`+ foldersWithSources.Push(types.SourceFolder{Folder: context[constants.CTX_SKETCH_BUILD_PATH].(string), Recurse: true})`
`67`	`67`	`if utils.MapHas(context, constants.CTX_IMPORTED_LIBRARIES) {`
`68`	`68`	`for _, library := range context[constants.CTX_IMPORTED_LIBRARIES].([]*types.Library) {`
`69`		`- foldersWithSources.Push(library.SrcFolder)`
	`69`	`+ sourceFolders := utils.LibraryToSourceFolder(library)`
	`70`	`+ for _, sourceFolder := range sourceFolders {`
	`71`	`+ foldersWithSources.Push(sourceFolder)`
	`72`	`+ }`
`70`	`73`	`}`
`71`	`74`	`}`
`72`	`75`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,15 @@ func (s *IncludesToIncludeFolders) Run(context map[string]interface{}) error {`
`62`	`62`	`return utils.WrapError(err)`
`63`	`63`	`}`
`64`	`64`
`65`		`- foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue)`
	`65`	`+ foldersWithSources := context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue)`
`66`	`66`
`67`	`67`	`for _, newlyImportedLibrary := range newlyImportedLibraries {`
`68`	`68`	`if !sliceContainsLibrary(importedLibraries, newlyImportedLibrary) {`
`69`	`69`	`importedLibraries = append(importedLibraries, newlyImportedLibrary)`
`70`		`- foldersWithSources.Push(newlyImportedLibrary.SrcFolder)`
	`70`	`+ sourceFolders := utils.LibraryToSourceFolder(newlyImportedLibrary)`
	`71`	`+ for _, sourceFolder := range sourceFolders {`
	`72`	`+ foldersWithSources.Push(sourceFolder)`
	`73`	`+ }`
`71`	`74`	`}`
`72`	`75`	`}`
`73`	`76`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) {`
`55`	`55`	`require.NotNil(t, context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH])`
`56`	`56`
`57`	`57`	`require.True(t, context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue).Empty())`
`58`		`- require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue).Empty())`
	`58`	`+ require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue).Empty())`
`59`	`59`
`60`	`60`	`require.Equal(t, 0, len(context[constants.CTX_LIBRARY_RESOLUTION_RESULTS].(map[string]types.LibraryResolutionResult)))`
`61`	`61`	`}`
`@@ -79,7 +79,7 @@ func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) {`
`79`	`79`	`require.NotNil(t, context[constants.CTX_LIBRARY_DISCOVERY_RECURSION_DEPTH])`
`80`	`80`
`81`	`81`	`require.True(t, context[constants.CTX_COLLECTED_SOURCE_FILES_QUEUE].(*types.UniqueStringQueue).Empty())`
`82`		`- require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueStringQueue).Empty())`
	`82`	`+ require.True(t, context[constants.CTX_FOLDERS_WITH_SOURCES_QUEUE].(*types.UniqueSourceFolderQueue).Empty())`
`83`	`83`
`84`	`84`	`require.Equal(t, 0, len(context[constants.CTX_LIBRARY_RESOLUTION_RESULTS].(map[string]types.LibraryResolutionResult)))`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ #error "This file is never supposed to be compiled"`