Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"condition": {
"type": "inList",
"string": "$env{Platform}",
"string": "$env{VSCMD_ARG_TGT_ARCH}",
"list": [
"x64",
""
Expand All @@ -39,7 +39,7 @@
},
"condition": {
"type": "inList",
"string": "$env{Platform}",
"string": "$env{VSCMD_ARG_TGT_ARCH}",
"list": [
"x86",
""
Expand All @@ -56,7 +56,7 @@
},
"condition": {
"type": "inList",
"string": "$env{Platform}",
"string": "$env{VSCMD_ARG_TGT_ARCH}",
"list": [
"arm64",
""
Expand All @@ -76,7 +76,7 @@
},
"condition": {
"type": "inList",
"string": "$env{Platform}",
"string": "$env{VSCMD_ARG_TGT_ARCH}",
"list": [
"arm64",
""
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/stl-lit/stl-lit.in
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ builtin_parameters= {}
builtin_parameters['config_map'] = config_map

def assert_same_platform_for_build_and_test():
build_platform = '$ENV{Platform}'
test_platform = os.getenv('Platform', default='')
build_platform = '$ENV{VSCMD_ARG_TGT_ARCH}'
test_platform = os.getenv('VSCMD_ARG_TGT_ARCH', default='')
if build_platform != '' and test_platform != '' and build_platform != test_platform:
exit(f'Target platform mismatch: the STL was built for {build_platform} but tested for {test_platform}.')

Expand Down