Author: Vladislav Dzhidzhoev Date: 2024-07-10T00:25:50+02:00 New Revision: 7021e44b2f0e11717c0d82456bad0fed4a0b48f9
URL: https://github.com/llvm/llvm-project/commit/7021e44b2f0e11717c0d82456bad0fed4a0b48f9 DIFF: https://github.com/llvm/llvm-project/commit/7021e44b2f0e11717c0d82456bad0fed4a0b48f9.diff LOG: [lldb][test] Set target and host OS for API tests in case of remote testing Makefile.rules uses HOST_OS and OS variables for determining host and target OSes for API tests compilation. This commit moves the platform detection logic from Makefile to Python lldb test suite. This is useful for the case of Windows-to-Linux cross-testing. Added: Modified: lldb/packages/Python/lldbsuite/test/lldbplatformutil.py lldb/packages/Python/lldbsuite/test/make/Makefile.rules Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py index 21f2095db90f8..818fdf0e6b5c5 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py +++ b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py @@ -92,11 +92,28 @@ def match_android_device(device_arch, valid_archs=None, valid_api_levels=None): def finalize_build_dictionary(dictionary): + # Provide uname-like platform name + platform_name_to_uname = { + "linux": "Linux", + "netbsd": "NetBSD", + "freebsd": "FreeBSD", + "windows": "Windows_NT", + "macosx": "Darwin", + "darwin": "Darwin", + } + + if dictionary is None: + dictionary = {} if target_is_android(): - if dictionary is None: - dictionary = {} dictionary["OS"] = "Android" dictionary["PIE"] = 1 + elif platformIsDarwin(): + dictionary["OS"] = "Darwin" + else: + dictionary["OS"] = platform_name_to_uname[getPlatform()] + + dictionary["HOST_OS"] = platform_name_to_uname[getHostPlatform()] + return dictionary diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index bd8eea3d6f5a0..3d562285ce9cc 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -55,7 +55,10 @@ LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../ # When running tests from Visual Studio, the environment variable isn't # inherited all the way down to the process spawned for make. #---------------------------------------------------------------------- -HOST_OS := $(shell uname -s) +ifeq "$(HOST_OS)" "" + HOST_OS := $(shell uname -s) +endif + ifneq (,$(findstring windows32,$(HOST_OS))) HOST_OS := Windows_NT endif _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
