diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 13:37:10 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 17:57:52 +0100 |
| commit | db745fdd2dbd57af54f7da637eef6c892824a6fb (patch) | |
| tree | 4bc3bfbbdb8043eb316606d33a88f009f448598b /util/cmake/tests/test_logic_mapping.py | |
| parent | 1b7008a3d784f3f266368f824cb43d473a301ba1 (diff) | |
cmake: Fix naming when referring to Apple macOS
Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake/tests/test_logic_mapping.py')
| -rwxr-xr-x | util/cmake/tests/test_logic_mapping.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/util/cmake/tests/test_logic_mapping.py b/util/cmake/tests/test_logic_mapping.py index c18c3ddc65e..96feb3e6154 100755 --- a/util/cmake/tests/test_logic_mapping.py +++ b/util/cmake/tests/test_logic_mapping.py @@ -124,34 +124,34 @@ def test_simplify_win32_and_watchos(): def test_simplify_apple_and_appleosx(): - validate_simplify('APPLE AND APPLE_OSX', 'APPLE_OSX') + validate_simplify('APPLE AND APPLE_MACOS', 'APPLE_MACOS') def test_simplify_apple_or_appleosx(): - validate_simplify('APPLE OR APPLE_OSX', 'APPLE') + validate_simplify('APPLE OR APPLE_MACOS', 'APPLE') def test_simplify_apple_or_appleosx_level1(): - validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar') + validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar') def test_simplify_apple_or_appleosx_level1_double(): - validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar') + validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar') def test_simplify_apple_or_appleosx_level1_double_with_extra_spaces(): - validate_simplify('foobar AND (APPLE OR APPLE_OSX ) ' - 'AND ( APPLE_OSX OR APPLE )', 'APPLE AND foobar') + validate_simplify('foobar AND (APPLE OR APPLE_MACOS ) ' + 'AND ( APPLE_MACOS OR APPLE )', 'APPLE AND foobar') def test_simplify_apple_or_appleosx_level2(): validate_simplify('foobar AND ( ( APPLE OR APPLE_WATCHOS ) ' - 'OR APPLE_OSX ) AND ( APPLE_OSX OR APPLE ) ' + 'OR APPLE_MACOS ) AND ( APPLE_MACOS OR APPLE ) ' 'AND ( (WIN32 OR WINRT) OR UNIX) ', 'APPLE AND foobar') def test_simplify_not_apple_and_appleosx(): - validate_simplify('NOT APPLE AND APPLE_OSX', 'OFF') + validate_simplify('NOT APPLE AND APPLE_MACOS', 'OFF') def test_simplify_unix_and_bar_or_win32(): @@ -182,5 +182,5 @@ def test_simplify_complex_false(): def test_simplify_android_not_apple(): - validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_OSX', + validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_MACOS', 'ANDROID AND NOT ANDROID_EMBEDDED') |