Skip to content

Toolset update: VS 2022 17.3 Preview 1 #2714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from 8 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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,27 @@ if("${VCLIBS_TARGET_ARCHITECTURE}" MATCHES "^[xX]86$")
# Note that we set _WIN32_WINNT to a high level to make declarations available, but still engage downlevel
# runtime dynamic linking by setting our own _STL_WIN32_WINNT back to Windows XP.
add_compile_definitions(_X86_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501
_WIN32_WINNT=0x0602 NTDDI_VERSION=NTDDI_WIN8)
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_CO)
add_compile_options(/arch:IA32)
elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^[xX]64$")
set(VCLIBS_TARGET_ARCHITECTURE "x64")
set(VCLIBS_I386_OR_AMD64 "amd64")
set(VCLIBS_X86_OR_X64 "x64")
add_compile_definitions(_AMD64_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501
_WIN32_WINNT=0x0602 NTDDI_VERSION=NTDDI_WIN8)
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_CO)
elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^[aA][rR][mM][vV]7$")
set(VCLIBS_TARGET_ARCHITECTURE "arm")
set(VCLIBS_I386_OR_AMD64 "arm")
set(VCLIBS_X86_OR_X64 "arm")
add_compile_definitions(_ARM_ _VCRT_WIN32_WINNT=0x0602 _STL_WIN32_WINNT=0x0602
_WIN32_WINNT=0x0602 NTDDI_VERSION=NTDDI_WIN8)
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_CO)
string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " Synchronization.lib")
elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^[aA][rR][mM]64$")
set(VCLIBS_TARGET_ARCHITECTURE "arm64")
set(VCLIBS_I386_OR_AMD64 "arm64")
set(VCLIBS_X86_OR_X64 "arm64")
add_compile_definitions(_ARM64_ _VCRT_WIN32_WINNT=0x0A00 _STL_WIN32_WINNT=0x0A00
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10)
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_CO)
string(APPEND CMAKE_CXX_STANDARD_LIBRARIES " Synchronization.lib")
else()
message(FATAL_ERROR "Could not determine target architecture: VCLIBS_TARGET_ARCHITECTURE: ${VCLIBS_TARGET_ARCHITECTURE}")
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem

# How To Build With The Visual Studio IDE

1. Install Visual Studio 2022 17.2 Preview 3 or later.
1. Install Visual Studio 2022 17.3 Preview 1 or later.
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
* Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.
Expand All @@ -155,7 +156,8 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem

# How To Build With A Native Tools Command Prompt

1. Install Visual Studio 2022 17.2 Preview 3 or later.
1. Install Visual Studio 2022 17.3 Preview 1 or later.
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
* Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.
Expand Down
2 changes: 1 addition & 1 deletion azure-devops/provision-image.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if ([string]::IsNullOrEmpty($AdminUserPassword)) {
$PsExecPath = Join-Path $ExtractedPsToolsPath 'PsExec64.exe'

# https://github.com/PowerShell/PowerShell/releases/latest
$PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.zip'
$PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.3/PowerShell-7.2.3-win-x64.zip'
Write-Host "Downloading: $PowerShellZipUrl"
$ExtractedPowerShellPath = DownloadAndExtractZip -Url $PowerShellZipUrl
$PwshPath = Join-Path $ExtractedPowerShellPath 'pwsh.exe'
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:
tmpDir: 'D:\Temp'
buildOutputLocation: 'D:\build'

pool: 'StlBuild-2022-04-12-T1624'
pool: 'StlBuild-2022-05-10-T1718'

stages:
- stage: Code_Format
Expand Down
1 change: 0 additions & 1 deletion stl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@ add_compile_definitions(_CRTBLD _VCRT_ALLOW_INTERNALS _HAS_OLD_IOSTREAMS_MEMBERS

include_directories(BEFORE
"${CMAKE_CURRENT_LIST_DIR}/inc"
"${TOOLSET_ROOT_DIR}/crt/src/concrt"
"${TOOLSET_ROOT_DIR}/crt/src/vcruntime"
)

Expand Down
35 changes: 8 additions & 27 deletions stl/src/filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,13 @@ namespace {
return __std_win_error{GetLastError()};
}

struct _File_disposition_info_ex {
DWORD _Flags;
};

[[nodiscard]] _Success_(return == __std_win_error::_Success) __std_win_error
__stdcall _Set_delete_flag(_In_ __std_fs_file_handle _Handle) {
// From newer Windows SDK than currently used to build vctools:
// #define FILE_DISPOSITION_FLAG_DELETE 0x00000001
// #define FILE_DISPOSITION_FLAG_POSIX_SEMANTICS 0x00000002

// typedef struct _FILE_DISPOSITION_INFO_EX {
// DWORD Flags;
// } FILE_DISPOSITION_INFO_EX, *PFILE_DISPOSITION_INFO_EX;

_File_disposition_info_ex _Info_ex{0x3};

// FileDispositionInfoEx isn't documented in MSDN at the time of this writing, but is present
// in minwinbase.h as of at least 10.0.16299.0
constexpr auto _FileDispositionInfoExClass = static_cast<FILE_INFO_BY_HANDLE_CLASS>(21);
// See minwinbase.h and WinBase.h.
FILE_DISPOSITION_INFO_EX _Info_ex{FILE_DISPOSITION_FLAG_DELETE | FILE_DISPOSITION_FLAG_POSIX_SEMANTICS};
if (SetFileInformationByHandle(
reinterpret_cast<HANDLE>(_Handle), _FileDispositionInfoExClass, &_Info_ex, sizeof(_Info_ex))) {
reinterpret_cast<HANDLE>(_Handle), FileDispositionInfoEx, &_Info_ex, sizeof(_Info_ex))) {
return __std_win_error::_Success;
}

Expand Down Expand Up @@ -546,16 +532,11 @@ _Success_(return == __std_win_error::_Success) __std_win_error
return {false, _Translate_not_found_to_success(_Last_error)};
}

// For Windows 10 1809 or later we have this flag -> FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE 0x10
// This flag also deletes read-only files.
// NOTE: This is currently undocumented in MSDN. Refer to WinBase.h for declarations.

// The following bits are set here
// FILE_DISPOSITION_FLAG_DELETE, FILE_DISPOSITION_FLAG_POSIX_SEMANTICS,
// FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE
_File_disposition_info_ex _Info_ex{0x3 | 0x10};
constexpr auto _FileDispositionInfoExClass = static_cast<FILE_INFO_BY_HANDLE_CLASS>(21);
if (SetFileInformationByHandle(_Handle._Get(), _FileDispositionInfoExClass, &_Info_ex, sizeof(_Info_ex))) {
// See minwinbase.h and WinBase.h.
// Windows 10 1809 added support for FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE.
FILE_DISPOSITION_INFO_EX _Info_ex{FILE_DISPOSITION_FLAG_DELETE | FILE_DISPOSITION_FLAG_POSIX_SEMANTICS
| FILE_DISPOSITION_FLAG_IGNORE_READONLY_ATTRIBUTE};
if (SetFileInformationByHandle(_Handle._Get(), FileDispositionInfoEx, &_Info_ex, sizeof(_Info_ex))) {
return {true, __std_win_error::_Success};
}

Expand Down
7 changes: 1 addition & 6 deletions tests/std/include/test_thread_support.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <thread>
#ifdef _MSC_EXTENSIONS

#include <Windows.h>
#endif // _MSC_EXTENSIONS

class one_shot {
bool unblock = false;
Expand Down Expand Up @@ -50,16 +49,12 @@ class watchdog {
}

static void kill_if_not_debugging() {
#ifdef _MSC_EXTENSIONS
if (::IsDebuggerPresent()) {
fprintf(stdout, "Watchdog not terminating because debugger is connected.\n");
fflush(stdout);
} else {
kill();
}
#else // ^^^ _MSC_EXTENSIONS ^^^ // vvv !_MSC_EXTENSIONS vvv
kill();
#endif // _MSC_EXTENSIONS
}

public:
Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/Dev08_563686_ostream/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\native_winsdk_matrix.lst
RUNALL_INCLUDE ..\native_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/Dev09_056375_locale_cleanup/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/Dev09_056375_locale_cleanup/testdll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ref struct Test {
static
#else
extern "C" {
_declspec(dllexport)
__declspec(dllexport)
#endif

void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ int main() {} // COMPILE-ONLY

#define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__)

// Work around VSO-119998 "/Za's elided-copy-ctor check is still bogus".
#ifdef _MSC_EXTENSIONS

// This test program verifies all of the container requirements for the Standard Library containers,
// including the four non-array sequence containers (deque, forward_list, list, vector), the four
// associative containers (map, multimap, multiset, and set), and the four unordered associative
Expand Down Expand Up @@ -3042,4 +3039,3 @@ void assert_all() {
assert_container<tag_unordered_multiset>();
assert_container<tag_unordered_set>();
}
#endif // _MSC_EXTENSIONS
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_matrix.lst
RUNALL_CROSSLIST
PM_CL="/D_STL_OPTIMIZE_SYSTEM_ERROR_OPERATORS=0"
PM_CL="/D_STL_OPTIMIZE_SYSTEM_ERROR_OPERATORS=1"
4 changes: 0 additions & 4 deletions tests/std/tests/GH_002030_asan_annotate_vector/env.lst
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive /fno-sanitize-ad
PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
PM_CL="-fsanitize=address /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
PM_CL="-fsanitize=address /Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
PM_CL="-fsanitize=address /Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MD /std:c++14 /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MDd /std:c++17 /permissive- /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /BE /c /EHsc /MT /std:c++20 /permissive- /fno-sanitize-address-vcasan-lib"
Expand All @@ -51,8 +49,6 @@ PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive /fno-sanitize-ad
PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /analyze:only /analyze:autolog- /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /fp:strict /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /EHsc /MTd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /Za /EHsc /MD /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
PM_CL="/D_ANNOTATE_VECTOR /Za /EHsc /MDd /std:c++latest /permissive- /fno-sanitize-address-vcasan-lib"
# TRANSITION, clang-cl does not support /alternatename so we cannot test /D_ANNOTATE_VECTOR without -fsanitize=address
PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++14"
PM_COMPILER="clang-cl" PM_CL="-fsanitize=address -fno-ms-compatibility -fno-delayed-template-parsing /EHsc /MD /std:c++17"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
RUNALL_CROSSLIST
PM_CL=""
PM_CL="/D_USE_STD_VECTOR_ALGORITHMS=0"
2 changes: 0 additions & 2 deletions tests/std/tests/P0088R3_variant/env.lst
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri
PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-"
PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE"
PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-"
PM_CL="/Za /EHsc /MD /std:c++latest /permissive-"
PM_CL="/Za /EHsc /MDd /std:c++latest /permissive-"
PM_CL="/clr /MD /std:c++17 /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE"
PM_CL="/clr /MDd /std:c++17 /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE"
PM_CL="/BE /c /EHsc /MD /std:c++latest /permissive-"
Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/P0122R7_span_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0220R1_optional_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_17_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_17_matrix.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0645R10_text_formatting_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:strict"
PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-"
PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive"
PM_CL="/MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-"
PM_CL="/std:c++20 /permissive- /Za /MD"
PM_CL="/std:c++latest /permissive- /Za /MDd"
# PM_CL="/std:c++20 /permissive- /BE /c /MD"
# PM_CL="/std:c++latest /permissive- /BE /c /MTd"
# PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing /std:c++20 /permissive- /MD"
Expand Down
2 changes: 1 addition & 1 deletion tests/std/tests/P0660R10_stop_token_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_common_iterator_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_counted_iterator_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_istream_view_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_ranges_to_address/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_20_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_views_counted_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_views_drop_while_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_views_filter_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_views_take_while_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P0896R4_views_transform_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_20_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_20_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/P2443R1_views_chunk_by_death/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\strict_winsdk_concepts_latest_matrix.lst
RUNALL_INCLUDE ..\strict_concepts_latest_matrix.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\native_winsdk_matrix.lst
RUNALL_INCLUDE ..\native_matrix.lst
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,8 @@ void type_traits_test() {
virtual ~F() {}
};
type_traits_ref_test_impl<F, C>();
#ifdef _MSC_EXTENSIONS // TRANSITION, VSO-589178
type_traits_ref_test_impl<pair<int, double>>();
type_traits_ref_test_impl<tuple<int, int, int>>();
#endif // TRANSITION, VSO-589178

INSTANTIATE(make_integer_sequence<int, 0>);
INSTANTIATE(index_sequence<1, 1, 2, 3, 5, 8, 13>);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/VSO_0000000_string_view_idl/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_17_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_17_matrix.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\usual_winsdk_matrix.lst
RUNALL_INCLUDE ..\usual_matrix.lst
2 changes: 1 addition & 1 deletion tests/std/tests/VSO_0144114_sleep_until/env.lst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

RUNALL_INCLUDE ..\native_winsdk_matrix.lst
RUNALL_INCLUDE ..\native_matrix.lst
2 changes: 0 additions & 2 deletions tests/std/tests/VSO_0157762_feature_test_macros/env.lst
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri
PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-"
PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive"
PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-"
PM_CL="/Za /EHsc /MD /std:c++latest /permissive-"
PM_CL="/Za /EHsc /MDd /std:c++latest /permissive-"
PM_CL="/clr /MD /std:c++17"
PM_CL="/clr /MDd /std:c++17"
PM_CL="/clr:pure /MD /std:c++14"
Expand Down
Loading