From 74dc598a71ae39194c826c5e19dcc4042dec56e5 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 17 Jan 2024 15:00:46 -0800 Subject: [PATCH] Disable TestVariantSingletonModule when go test -short is used TestVariantSingletonModule tests that an error is produced when a mutator creates variants of a SingletonModule. It also triggers a data race when cloneLogicModules copies the properties, as the ModuleFactory of a SingletonModule always returns the same module with the same property structs. The build is about to fail with an error anyways, so hopefully the data race isn't a problem. There is no way to disable the test when the data race detector is enabled, so disable it when -short is enabled, which is the case for all of our CI testing. Test: go test -race -short ./... Change-Id: I944a4901acb60df8e590270f178961d95095a7e9 --- android/singleton_module_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/singleton_module_test.go b/android/singleton_module_test.go index 9d98478e2..3b1bf39e3 100644 --- a/android/singleton_module_test.go +++ b/android/singleton_module_test.go @@ -103,6 +103,9 @@ func testVariantSingletonModuleMutator(ctx BottomUpMutatorContext) { } func TestVariantSingletonModule(t *testing.T) { + if testing.Short() { + t.Skip("test fails with data race enabled") + } bp := ` test_singleton_module { name: "test_singleton_module",