Snap for 8564071 from 882a18888febb9cb0b9d6c6069498cbc4aa30f88 to mainline-art-releaseaml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-art-release

Change-Id: I173027e1513f8b33f7aec083bf3757087435e515

1 files changed, 2 insertions, 14 deletions

diff --git a/compiler_wrapper/config_test.go b/compiler_wrapper/config_test.go
index 5492a1bb..86a78928 100644
--- a/compiler_wrapper/config_test.go
+++ b/compiler_wrapper/config_test.go
@@ -38,7 +38,6 @@ func TestRealConfigWithUseCCacheFlag(t *testing.T) {
 	}
 }
 
-/* TODO: Re-enable this, when llvm-next is different than llvm
 func TestRealConfigWithUseLLvmFlag(t *testing.T) {
 	resetGlobals()
 	defer resetGlobals()
@@ -50,7 +49,7 @@ func TestRealConfigWithUseLLvmFlag(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if isUsingLLvmNext(cfg) {
+	if cfg.useLlvmNext {
 		t.Fatal("UseLLvmNext: Expected not to be used")
 	}
 
@@ -60,7 +59,7 @@ func TestRealConfigWithUseLLvmFlag(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if !isUsingLLvmNext(cfg) {
+	if !cfg.useLlvmNext {
 		t.Fatal("UseLLvmNext: Expected to be used")
 	}
 
@@ -69,7 +68,6 @@ func TestRealConfigWithUseLLvmFlag(t *testing.T) {
 		t.Fatalf("UseLlvmNext: Expected an error, got none")
 	}
 }
-*/
 
 func TestRealConfigWithConfigNameFlag(t *testing.T) {
 	resetGlobals()
@@ -128,16 +126,6 @@ func isSysrootHardened(cfg *config) bool {
 	return false
 }
 
-// TODO: Update this with correct flag when we change llvm-next.
-func isUsingLLvmNext(cfg *config) bool {
-	for _, arg := range cfg.clangFlags {
-		if arg == "-Wno-reorder-init-list" {
-			return true
-		}
-	}
-	return false
-}
-
 func resetGlobals() {
 	// Set all global variables to a defined state.
 	UseLlvmNext = "unknown"