[Lldb-commits] [lldb] a136148 - [lldb] Use Haswell instead of arm64 in TestUniversal64

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2023-05-05T09:01:23-07:00
New Revision: a136148d8faa89d88820238d69855daeedbd8681

URL: https://github.com/llvm/llvm-project/commit/a136148d8faa89d88820238d69855daeedbd8681
DIFF: https://github.com/llvm/llvm-project/commit/a136148d8faa89d88820238d69855daeedbd8681.diff

LOG: [lldb] Use Haswell instead of arm64 in TestUniversal64

The architecture doesn't really matter for the test, at least not until
the dynamic loader can load these fat64 binaries. Use Hawell instead of
arm64 to support older bots that don't know about Apple Silicon triples.

Added: 
    

Modified: 
    lldb/test/API/macosx/universal64/Makefile
    lldb/test/API/macosx/universal64/TestUniversal64.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/macosx/universal64/Makefile b/lldb/test/API/macosx/universal64/Makefile
index ea773863cedc1..bfbfc3d67c06a 100644
--- a/lldb/test/API/macosx/universal64/Makefile
+++ b/lldb/test/API/macosx/universal64/Makefile
@@ -8,17 +8,17 @@ include Makefile.rules
 
 all: fat.out
 
-fat.out: fat.arm64.out fat.x86_64.out
+fat.out: fat.x86_64h.out fat.x86_64.out
 	lipo -fat64 -create -o $@ $^
 
 fat.x86_64.out: fat.x86_64.o
 	$(CC) -isysroot $(SDKROOT) -target x86_64-apple-macosx10.9 -o $@ $<
 
-fat.arm64.out: fat.arm64.o
-	$(CC) -isysroot $(SDKROOT) -target arm64-apple-macosx10.9 -o $@ $<
+fat.x86_64h.out: fat.x86_64h.o
+	$(CC) -isysroot $(SDKROOT) -target x86_64h-apple-macosx10.9 -o $@ $<
 
 fat.x86_64.o: main.c
 	$(CC) -isysroot $(SDKROOT) -g -O0 -target x86_64-apple-macosx10.9 -c -o $@ $<
 
-fat.arm64.o: main.c
-	$(CC) -isysroot $(SDKROOT) -g -O0 -target arm64-apple-macosx10.9 -c -o $@ $<
+fat.x86_64h.o: main.c
+	$(CC) -isysroot $(SDKROOT) -g -O0 -target x86_64h-apple-macosx10.9 -c -o $@ $<

diff  --git a/lldb/test/API/macosx/universal64/TestUniversal64.py b/lldb/test/API/macosx/universal64/TestUniversal64.py
index 2296ac8b8324c..44b15f8defad6 100644
--- a/lldb/test/API/macosx/universal64/TestUniversal64.py
+++ b/lldb/test/API/macosx/universal64/TestUniversal64.py
@@ -20,7 +20,6 @@ def do_test(self):
     @skipIfAsan
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
-    @skipIf(macos_version=["<", "11.0"])
     def test_universal64_executable(self):
         """Test fat64 universal executable"""
         self.build(debug_info="dsym")
@@ -30,7 +29,6 @@ def test_universal64_executable(self):
     @skipIfAsan
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
-    @skipIf(macos_version=["<", "11.0"])
     def test_universal64_dsym(self):
         """Test fat64 universal dSYM"""
         self.build(debug_info="dsym", dictionary={'FAT64_DSYM': '1'})