Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 358ba4f0 authored by Cole Faust's avatar Cole Faust
Browse files

Make symlink forest errors deterministic 

We were looping over a map, and thus processing files
in a non-deterministic order. Some tests check for errors
produced during the symlink forest creation and they would
flake due to this nondeterminism.

Test: m nothing
Change-Id: Ie1a4cf98e341e4a951f110b7d5611bb69c4ddd2b
parent a905aba5

bp2build/symlink_forest.go

+9 −5
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import ( 
	"os"

	"path/filepath"

	"regexp"

	"sort"

	"sync"

	"sync/atomic"
@@ -275,14 +276,17 @@ func plantSymlinkForestRecursive(context *symlinkForestContext, instructions *in 
		}

	}



	allEntries := make(map[string]struct{})

	allEntries := make([]string, 0, len(srcDirMap)+len(buildFilesMap))

	for n := range srcDirMap {

		allEntries[n] = struct{}{}

		allEntries = append(allEntries, n)

	}



	for n := range buildFilesMap {

		allEntries[n] = struct{}{}

		if _, ok := srcDirMap[n]; !ok {

			allEntries = append(allEntries, n)

		}

	}

	// Tests read the error messages generated, so ensure their order is deterministic

	sort.Strings(allEntries)



	err := os.MkdirAll(shared.JoinPath(context.topdir, forestDir), 0777)

	if err != nil {
@@ -291,7 +295,7 @@ func plantSymlinkForestRecursive(context *symlinkForestContext, instructions *in 
	}

	context.mkdirCount.Add(1)



	for f := range allEntries {

	for _, f := range allEntries {

		if f[0] == '.' {

			continue // Ignore dotfiles

		}