diff options
Diffstat (limited to 'util/cmake/tests')
| -rwxr-xr-x | util/cmake/tests/test_logic_mapping.py | 24 | ||||
| -rwxr-xr-x | util/cmake/tests/test_scope_handling.py | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/util/cmake/tests/test_logic_mapping.py b/util/cmake/tests/test_logic_mapping.py index c18c3ddc65..6e4fd20590 100755 --- a/util/cmake/tests/test_logic_mapping.py +++ b/util/cmake/tests/test_logic_mapping.py @@ -116,42 +116,42 @@ def test_simplify_unix_and_win32_or_foobar_or_barfoo(): def test_simplify_watchos_and_win32(): - validate_simplify('APPLE_WATCHOS AND WIN32', 'OFF') + validate_simplify('WATCHOS AND WIN32', 'OFF') def test_simplify_win32_and_watchos(): - validate_simplify('WIN32 AND APPLE_WATCHOS', 'OFF') + validate_simplify('WIN32 AND WATCHOS', 'OFF') def test_simplify_apple_and_appleosx(): - validate_simplify('APPLE AND APPLE_OSX', 'APPLE_OSX') + validate_simplify('APPLE AND MACOS', 'MACOS') def test_simplify_apple_or_appleosx(): - validate_simplify('APPLE OR APPLE_OSX', 'APPLE') + validate_simplify('APPLE OR 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 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 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 MACOS ) ' + 'AND ( 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 ) ' + validate_simplify('foobar AND ( ( APPLE OR WATCHOS ) ' + 'OR MACOS ) AND ( 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 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 MACOS', 'ANDROID AND NOT ANDROID_EMBEDDED') diff --git a/util/cmake/tests/test_scope_handling.py b/util/cmake/tests/test_scope_handling.py index 1db8b2a079..51e569fb09 100755 --- a/util/cmake/tests/test_scope_handling.py +++ b/util/cmake/tests/test_scope_handling.py @@ -305,7 +305,7 @@ def test_qstandardpaths_scopes(): scope6 = _new_scope(parent_scope=scope5, condition='UNIX') # mac { # OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm - scope7 = _new_scope(parent_scope=scope6, condition='APPLE_OSX', SOURCES='qsp_mac.mm') + scope7 = _new_scope(parent_scope=scope6, condition='MACOS', SOURCES='qsp_mac.mm') # } else:android:!android-embedded { # SOURCES += io/qstandardpaths_android.cpp scope8 = _new_scope(parent_scope=scope6, condition='else') @@ -330,12 +330,12 @@ def test_qstandardpaths_scopes(): assert scope4.total_condition == 'WINRT' assert scope5.total_condition == 'UNIX' assert scope6.total_condition == 'UNIX' - assert scope7.total_condition == 'APPLE_OSX' - assert scope8.total_condition == 'UNIX AND NOT APPLE_OSX' + assert scope7.total_condition == 'MACOS' + assert scope8.total_condition == 'UNIX AND NOT MACOS' assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED' - assert scope10.total_condition == 'UNIX AND NOT APPLE_OSX AND (ANDROID_EMBEDDED OR NOT ANDROID)' + assert scope10.total_condition == 'UNIX AND NOT MACOS AND (ANDROID_EMBEDDED OR NOT ANDROID)' assert scope11.total_condition == 'HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' - assert scope12.total_condition == 'UNIX AND NOT APPLE_OSX AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' + assert scope12.total_condition == 'UNIX AND NOT MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' def test_recursive_expansion(): scope = _new_scope(A='Foo',B='$$A/Bar') |