StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data race in snapshot singletons when running parallel tests

Browse Source 
Singleton objects need to be created in the singleton factory rather
than as a global variable so that they have a unique object per
context in order to allow multiple tests to run in parallel.

Test: go test -race ./...
Change-Id: Ib6912849e1b849ffe8646882cfb476ddea6c6b55
This commit is contained in:
Colin Cross
2024-01-17 11:09:16 -08:00
parent 744a2a6b7d
commit 6c7e8ff86f
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
snapshot/recovery_snapshot.go
View File

@@ -22,16 +22,14 @@ type RecoverySnapshotModuleInterface interface {
ExcludeFromRecoverySnapshot() bool ExcludeFromRecoverySnapshot() bool
} }
var recoverySnapshotSingleton = SnapshotSingleton{ func RecoverySnapshotSingleton() android.Singleton {
return &SnapshotSingleton{
"recovery", // name "recovery", // name
"SOONG_RECOVERY_SNAPSHOT_ZIP", // makeVar "SOONG_RECOVERY_SNAPSHOT_ZIP", // makeVar
android.OptionalPath{}, // snapshotZipFile android.OptionalPath{}, // snapshotZipFile
RecoverySnapshotImageSingleton, // Image RecoverySnapshotImageSingleton, // Image
false, // Fake false, // Fake
} }
func RecoverySnapshotSingleton() android.Singleton {
return &recoverySnapshotSingleton
} }
// Determine if a dir under source tree is an SoC-owned proprietary directory based // Determine if a dir under source tree is an SoC-owned proprietary directory based

14
snapshot/vendor_snapshot.go
View File

@@ -22,28 +22,24 @@ type VendorSnapshotModuleInterface interface {
ExcludeFromVendorSnapshot() bool ExcludeFromVendorSnapshot() bool
} }
var vendorSnapshotSingleton = SnapshotSingleton{ func VendorSnapshotSingleton() android.Singleton {
return &SnapshotSingleton{
"vendor", // name "vendor", // name
"SOONG_VENDOR_SNAPSHOT_ZIP", // makeVar "SOONG_VENDOR_SNAPSHOT_ZIP", // makeVar
android.OptionalPath{}, // snapshotZipFile android.OptionalPath{}, // snapshotZipFile
VendorSnapshotImageSingleton, // Image VendorSnapshotImageSingleton, // Image
false, // Fake false, // Fake
} }
}
var vendorFakeSnapshotSingleton = SnapshotSingleton{ func VendorFakeSnapshotSingleton() android.Singleton {
return &SnapshotSingleton{
"vendor", // name "vendor", // name
"SOONG_VENDOR_FAKE_SNAPSHOT_ZIP", // makeVar "SOONG_VENDOR_FAKE_SNAPSHOT_ZIP", // makeVar
android.OptionalPath{}, // snapshotZipFile android.OptionalPath{}, // snapshotZipFile
VendorSnapshotImageSingleton, // Image VendorSnapshotImageSingleton, // Image
true, // Fake true, // Fake
} }
func VendorSnapshotSingleton() android.Singleton {
return &vendorSnapshotSingleton
}
func VendorFakeSnapshotSingleton() android.Singleton {
return &vendorFakeSnapshotSingleton
} }
// Determine if a dir under source tree is an SoC-owned proprietary directory based // Determine if a dir under source tree is an SoC-owned proprietary directory based