Enable __cpp_lib_concepts for EDG, part 2 (#4297)

microsoft · Feb 6, 2024 · d008413 · d008413
1 parent 81314e3
commit d008413
Show file tree

Hide file tree

Showing 241 changed files with 239 additions and 320 deletions.
diff --git a/tests/std/tests/GH_001914_cached_position/env.lst b/tests/std/tests/GH_001914_cached_position/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/env.lst b/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/env.lst
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
 RUNALL_CROSSLIST
 *	PM_CL=""
 *	PM_CL="/D_USE_STD_VECTOR_ALGORITHMS=0"
diff --git a/tests/std/tests/GH_002558_format_presetPadding/env.lst b/tests/std/tests/GH_002558_format_presetPadding/env.lst
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# This is concepts_20_matrix.lst + /presetPadding with clang configs disabled (clang-cl doesn't support /presetPadding)
+# This is usual_20_matrix.lst + /presetPadding with clang configs disabled (clang-cl doesn't support /presetPadding)
 RUNALL_INCLUDE ..\prefix.lst
 RUNALL_CROSSLIST
 *	PM_CL="/w14640 /Zc:threadSafeInit- /presetPadding"

diff --git a/tests/std/tests/GH_002581_common_reference_workaround/env.lst b/tests/std/tests/GH_002581_common_reference_workaround/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/GH_002992_unwrappable_iter_sent_pairs/env.lst b/tests/std/tests/GH_002992_unwrappable_iter_sent_pairs/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/GH_003003_format_decimal_point/env.lst b/tests/std/tests/GH_003003_format_decimal_point/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/GH_003676_format_large_hh_mm_ss_values/env.lst b/tests/std/tests/GH_003676_format_large_hh_mm_ss_values/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/GH_004023_mdspan_fwd_prod_overflow/env.lst b/tests/std/tests/GH_004023_mdspan_fwd_prod_overflow/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/GH_004201_chrono_formatter/env.lst b/tests/std/tests/GH_004201_chrono_formatter/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/LWG3480_directory_iterator_range/env.lst b/tests/std/tests/LWG3480_directory_iterator_range/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/LWG3610_iota_view_size_and_integer_class/env.lst b/tests/std/tests/LWG3610_iota_view_size_and_integer_class/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_default_accessor/env.lst b/tests/std/tests/P0009R18_mdspan_default_accessor/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_extents/env.lst b/tests/std/tests/P0009R18_mdspan_extents/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_extents_death/env.lst b/tests/std/tests/P0009R18_mdspan_extents_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_layout_left/env.lst b/tests/std/tests/P0009R18_mdspan_layout_left/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_layout_left_death/env.lst b/tests/std/tests/P0009R18_mdspan_layout_left_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_layout_right/env.lst b/tests/std/tests/P0009R18_mdspan_layout_right/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_layout_right_death/env.lst b/tests/std/tests/P0009R18_mdspan_layout_right_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_layout_stride/env.lst b/tests/std/tests/P0009R18_mdspan_layout_stride/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_layout_stride_death/env.lst b/tests/std/tests/P0009R18_mdspan_layout_stride_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_mdspan/env.lst b/tests/std/tests/P0009R18_mdspan_mdspan/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0009R18_mdspan_mdspan_death/env.lst b/tests/std/tests/P0009R18_mdspan_mdspan_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_latest_matrix.lst
+RUNALL_INCLUDE ..\usual_latest_matrix.lst
diff --git a/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/env.lst b/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/env.lst
@@ -1,6 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
 RUNALL_CROSSLIST
 *	PM_CL="/utf-8"
diff --git a/tests/std/tests/P0645R10_text_formatting_args/env.lst b/tests/std/tests/P0645R10_text_formatting_args/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_custom_formatting/env.lst b/tests/std/tests/P0645R10_text_formatting_custom_formatting/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_death/env.lst b/tests/std/tests/P0645R10_text_formatting_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_formatting/env.lst b/tests/std/tests/P0645R10_text_formatting_formatting/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_grapheme_clusterization/env.lst b/tests/std/tests/P0645R10_text_formatting_grapheme_clusterization/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst b/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# This is `concepts_20_matrix.lst` with `/execution-charset:.932` added.
+# This is `usual_20_matrix.lst` with `/execution-charset:.932` added.
 # clang is excluded since it doesn't support non-UTF-8 execution charsets.
 
 RUNALL_INCLUDE ..\prefix.lst

diff --git a/tests/std/tests/P0645R10_text_formatting_parse_contexts/env.lst b/tests/std/tests/P0645R10_text_formatting_parse_contexts/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_parsing/env.lst b/tests/std/tests/P0645R10_text_formatting_parsing/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0645R10_text_formatting_utf8/env.lst b/tests/std/tests/P0645R10_text_formatting_utf8/env.lst
@@ -1,6 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
 RUNALL_CROSSLIST
 *	PM_CL="/utf-8"
diff --git a/tests/std/tests/P0768R1_spaceship_cpos/env.lst b/tests/std/tests/P0768R1_spaceship_cpos/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_P1614R2_comparisons/env.lst b/tests/std/tests/P0896R4_P1614R2_comparisons/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_common_iterator_death/env.lst b/tests/std/tests/P0896R4_common_iterator_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_counted_iterator/env.lst b/tests/std/tests/P0896R4_counted_iterator/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_counted_iterator_death/env.lst b/tests/std/tests/P0896R4_counted_iterator_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_istream_view/env.lst b/tests/std/tests/P0896R4_istream_view/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_istream_view_death/env.lst b/tests/std/tests/P0896R4_istream_view_death/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_adjacent_find/env.lst b/tests/std/tests/P0896R4_ranges_alg_adjacent_find/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_all_of/env.lst b/tests/std/tests/P0896R4_ranges_alg_all_of/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_any_of/env.lst b/tests/std/tests/P0896R4_ranges_alg_any_of/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_binary_search/env.lst b/tests/std/tests/P0896R4_ranges_alg_binary_search/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_copy/env.lst b/tests/std/tests/P0896R4_ranges_alg_copy/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_copy_backward/env.lst b/tests/std/tests/P0896R4_ranges_alg_copy_backward/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_copy_if/env.lst b/tests/std/tests/P0896R4_ranges_alg_copy_if/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_copy_n/env.lst b/tests/std/tests/P0896R4_ranges_alg_copy_n/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_count/env.lst b/tests/std/tests/P0896R4_ranges_alg_count/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_count_if/env.lst b/tests/std/tests/P0896R4_ranges_alg_count_if/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_equal/env.lst b/tests/std/tests/P0896R4_ranges_alg_equal/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_fill/env.lst b/tests/std/tests/P0896R4_ranges_alg_fill/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_fill_n/env.lst b/tests/std/tests/P0896R4_ranges_alg_fill_n/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_find/env.lst b/tests/std/tests/P0896R4_ranges_alg_find/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_find_end/env.lst b/tests/std/tests/P0896R4_ranges_alg_find_end/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_find_first_of/env.lst b/tests/std/tests/P0896R4_ranges_alg_find_first_of/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_find_if/env.lst b/tests/std/tests/P0896R4_ranges_alg_find_if/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_find_if_not/env.lst b/tests/std/tests/P0896R4_ranges_alg_find_if_not/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_for_each/env.lst b/tests/std/tests/P0896R4_ranges_alg_for_each/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_for_each_n/env.lst b/tests/std/tests/P0896R4_ranges_alg_for_each_n/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_generate/env.lst b/tests/std/tests/P0896R4_ranges_alg_generate/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_generate_n/env.lst b/tests/std/tests/P0896R4_ranges_alg_generate_n/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_heap/env.lst b/tests/std/tests/P0896R4_ranges_alg_heap/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_includes/env.lst b/tests/std/tests/P0896R4_ranges_alg_includes/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst
diff --git a/tests/std/tests/P0896R4_ranges_alg_inplace_merge/env.lst b/tests/std/tests/P0896R4_ranges_alg_inplace_merge/env.lst
@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-RUNALL_INCLUDE ..\concepts_20_matrix.lst
+RUNALL_INCLUDE ..\usual_20_matrix.lst