diff --git a/libcxx/test/libcxx/transitive_includes.sh.cpp b/libcxx/test/libcxx/transitive_includes.sh.cpp
--- a/libcxx/test/libcxx/transitive_includes.sh.cpp
+++ b/libcxx/test/libcxx/transitive_includes.sh.cpp
@@ -20,9 +20,8 @@
 // would need to add significant complexity to make that work.
 // UNSUPPORTED: no-localization, no-threads, no-wide-characters, no-filesystem, libcpp-has-no-incomplete-format
 
-// This test only supports being run with the latest Standard, otherwise we'd
-// have to support various versions of the test.
-// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
+// TODO FIX C++ 03, the issue is the experimental library doesn't work with C++03 but isn't guarded.
+// UNSUPPORTED: c++03
 
 // When built with modules, this test doesn't work because --trace-includes doesn't
 // report the stack of includes correctly.
@@ -51,14 +50,16 @@
 
 # To re-generate the list of expected headers, temporarily set this to True, re-generate
 # the file and run this test.
+# WARNING this regeneration needs to be done for all supported language versions of libc++.
+# for std in c++03 c++11 c++14 c++17 c++20 c++2b; do ${lit} -Dstd=$std ${path_to_this_file}; done
 regenerate_expected_results = False
 
 # Used because the sequence of tokens RUN : can't appear anywhere or it'll confuse Lit.
 RUN = "RUN"
 
 if regenerate_expected_results:
-  print(f"// {RUN}: rm -rf %S/transitive_includes")
-  print(f"// {RUN}: mkdir %S/transitive_includes")
+  print(f"// {RUN}: echo rm -rf %S/transitive_includes/%{{cxx_std}}") ##### TODO remove echo
+  print(f"// {RUN}: mkdir %S/transitive_includes/%{{cxx_std}}")
 
 for i, header in enumerate(public_headers):
   if header.endswith('.h'): # Skip C compatibility headers
@@ -66,14 +67,15 @@
 
   normalized_header = re.sub('/', '_', header)
   trace_includes = "%{{cxx}} %s %{{flags}} %{{compile_flags}} --trace-includes -fsyntax-only -DTEST_{} 2>&1".format(i)
+
   if regenerate_expected_results:
-    print(f"// {RUN}: {trace_includes} | %{{python}} %S/transitive_includes.sanitize.py > %S/transitive_includes/expected.{normalized_header}")
+    print(f"// {RUN}: {trace_includes} | %{{python}} %S/transitive_includes.sanitize.py > %S/transitive_includes/%{{cxx_std}}/expected.{normalized_header}")
   else:
     print(f"// {RUN}: {trace_includes} | %{{python}} %S/transitive_includes.sanitize.py > %t.actual.{normalized_header}")
-    print(f"// {RUN}: diff -w %S/transitive_includes/expected.{normalized_header} %t.actual.{normalized_header}")
+    print(f"// {RUN}: diff -w %S/transitive_includes/%{{cxx_std}}/expected.{normalized_header} %t.actual.{normalized_header}")
 
-  print("#if defined(TEST_{})".format(i))
-  print("#include <{}>".format(header))
+  print(f"#if defined(TEST_{i})")
+  print(f"#include <{header}>")
   print("#endif")
 
 END-SCRIPT
@@ -82,597 +84,597 @@
 // DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW
 // GENERATED-MARKER
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_0 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.algorithm
-// RUN: diff -w %S/transitive_includes/expected.algorithm %t.actual.algorithm
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.algorithm %t.actual.algorithm
 #if defined(TEST_0)
 #include <algorithm>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_1 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.any
-// RUN: diff -w %S/transitive_includes/expected.any %t.actual.any
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.any %t.actual.any
 #if defined(TEST_1)
 #include <any>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_2 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.array
-// RUN: diff -w %S/transitive_includes/expected.array %t.actual.array
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.array %t.actual.array
 #if defined(TEST_2)
 #include <array>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_3 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.atomic
-// RUN: diff -w %S/transitive_includes/expected.atomic %t.actual.atomic
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.atomic %t.actual.atomic
 #if defined(TEST_3)
 #include <atomic>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_4 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.barrier
-// RUN: diff -w %S/transitive_includes/expected.barrier %t.actual.barrier
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.barrier %t.actual.barrier
 #if defined(TEST_4)
 #include <barrier>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_5 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.bit
-// RUN: diff -w %S/transitive_includes/expected.bit %t.actual.bit
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.bit %t.actual.bit
 #if defined(TEST_5)
 #include <bit>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_6 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.bitset
-// RUN: diff -w %S/transitive_includes/expected.bitset %t.actual.bitset
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.bitset %t.actual.bitset
 #if defined(TEST_6)
 #include <bitset>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_7 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cassert
-// RUN: diff -w %S/transitive_includes/expected.cassert %t.actual.cassert
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cassert %t.actual.cassert
 #if defined(TEST_7)
 #include <cassert>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_8 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ccomplex
-// RUN: diff -w %S/transitive_includes/expected.ccomplex %t.actual.ccomplex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ccomplex %t.actual.ccomplex
 #if defined(TEST_8)
 #include <ccomplex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_9 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cctype
-// RUN: diff -w %S/transitive_includes/expected.cctype %t.actual.cctype
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cctype %t.actual.cctype
 #if defined(TEST_9)
 #include <cctype>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_10 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cerrno
-// RUN: diff -w %S/transitive_includes/expected.cerrno %t.actual.cerrno
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cerrno %t.actual.cerrno
 #if defined(TEST_10)
 #include <cerrno>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_11 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cfenv
-// RUN: diff -w %S/transitive_includes/expected.cfenv %t.actual.cfenv
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cfenv %t.actual.cfenv
 #if defined(TEST_11)
 #include <cfenv>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_12 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cfloat
-// RUN: diff -w %S/transitive_includes/expected.cfloat %t.actual.cfloat
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cfloat %t.actual.cfloat
 #if defined(TEST_12)
 #include <cfloat>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_13 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.charconv
-// RUN: diff -w %S/transitive_includes/expected.charconv %t.actual.charconv
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.charconv %t.actual.charconv
 #if defined(TEST_13)
 #include <charconv>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_14 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.chrono
-// RUN: diff -w %S/transitive_includes/expected.chrono %t.actual.chrono
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.chrono %t.actual.chrono
 #if defined(TEST_14)
 #include <chrono>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_15 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cinttypes
-// RUN: diff -w %S/transitive_includes/expected.cinttypes %t.actual.cinttypes
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cinttypes %t.actual.cinttypes
 #if defined(TEST_15)
 #include <cinttypes>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_16 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ciso646
-// RUN: diff -w %S/transitive_includes/expected.ciso646 %t.actual.ciso646
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ciso646 %t.actual.ciso646
 #if defined(TEST_16)
 #include <ciso646>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_17 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.climits
-// RUN: diff -w %S/transitive_includes/expected.climits %t.actual.climits
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.climits %t.actual.climits
 #if defined(TEST_17)
 #include <climits>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_18 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.clocale
-// RUN: diff -w %S/transitive_includes/expected.clocale %t.actual.clocale
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.clocale %t.actual.clocale
 #if defined(TEST_18)
 #include <clocale>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_19 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cmath
-// RUN: diff -w %S/transitive_includes/expected.cmath %t.actual.cmath
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cmath %t.actual.cmath
 #if defined(TEST_19)
 #include <cmath>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_20 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.codecvt
-// RUN: diff -w %S/transitive_includes/expected.codecvt %t.actual.codecvt
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.codecvt %t.actual.codecvt
 #if defined(TEST_20)
 #include <codecvt>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_21 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.compare
-// RUN: diff -w %S/transitive_includes/expected.compare %t.actual.compare
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.compare %t.actual.compare
 #if defined(TEST_21)
 #include <compare>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_22 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.complex
-// RUN: diff -w %S/transitive_includes/expected.complex %t.actual.complex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.complex %t.actual.complex
 #if defined(TEST_22)
 #include <complex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_24 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.concepts
-// RUN: diff -w %S/transitive_includes/expected.concepts %t.actual.concepts
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.concepts %t.actual.concepts
 #if defined(TEST_24)
 #include <concepts>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_25 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.condition_variable
-// RUN: diff -w %S/transitive_includes/expected.condition_variable %t.actual.condition_variable
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.condition_variable %t.actual.condition_variable
 #if defined(TEST_25)
 #include <condition_variable>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_26 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.coroutine
-// RUN: diff -w %S/transitive_includes/expected.coroutine %t.actual.coroutine
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.coroutine %t.actual.coroutine
 #if defined(TEST_26)
 #include <coroutine>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_27 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.csetjmp
-// RUN: diff -w %S/transitive_includes/expected.csetjmp %t.actual.csetjmp
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.csetjmp %t.actual.csetjmp
 #if defined(TEST_27)
 #include <csetjmp>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_28 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.csignal
-// RUN: diff -w %S/transitive_includes/expected.csignal %t.actual.csignal
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.csignal %t.actual.csignal
 #if defined(TEST_28)
 #include <csignal>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_29 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdarg
-// RUN: diff -w %S/transitive_includes/expected.cstdarg %t.actual.cstdarg
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstdarg %t.actual.cstdarg
 #if defined(TEST_29)
 #include <cstdarg>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_30 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdbool
-// RUN: diff -w %S/transitive_includes/expected.cstdbool %t.actual.cstdbool
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstdbool %t.actual.cstdbool
 #if defined(TEST_30)
 #include <cstdbool>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_31 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstddef
-// RUN: diff -w %S/transitive_includes/expected.cstddef %t.actual.cstddef
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstddef %t.actual.cstddef
 #if defined(TEST_31)
 #include <cstddef>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_32 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdint
-// RUN: diff -w %S/transitive_includes/expected.cstdint %t.actual.cstdint
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstdint %t.actual.cstdint
 #if defined(TEST_32)
 #include <cstdint>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_33 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdio
-// RUN: diff -w %S/transitive_includes/expected.cstdio %t.actual.cstdio
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstdio %t.actual.cstdio
 #if defined(TEST_33)
 #include <cstdio>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_34 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstdlib
-// RUN: diff -w %S/transitive_includes/expected.cstdlib %t.actual.cstdlib
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstdlib %t.actual.cstdlib
 #if defined(TEST_34)
 #include <cstdlib>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_35 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cstring
-// RUN: diff -w %S/transitive_includes/expected.cstring %t.actual.cstring
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cstring %t.actual.cstring
 #if defined(TEST_35)
 #include <cstring>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_36 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ctgmath
-// RUN: diff -w %S/transitive_includes/expected.ctgmath %t.actual.ctgmath
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ctgmath %t.actual.ctgmath
 #if defined(TEST_36)
 #include <ctgmath>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_37 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ctime
-// RUN: diff -w %S/transitive_includes/expected.ctime %t.actual.ctime
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ctime %t.actual.ctime
 #if defined(TEST_37)
 #include <ctime>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_39 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cuchar
-// RUN: diff -w %S/transitive_includes/expected.cuchar %t.actual.cuchar
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cuchar %t.actual.cuchar
 #if defined(TEST_39)
 #include <cuchar>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_40 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cwchar
-// RUN: diff -w %S/transitive_includes/expected.cwchar %t.actual.cwchar
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cwchar %t.actual.cwchar
 #if defined(TEST_40)
 #include <cwchar>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_41 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.cwctype
-// RUN: diff -w %S/transitive_includes/expected.cwctype %t.actual.cwctype
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.cwctype %t.actual.cwctype
 #if defined(TEST_41)
 #include <cwctype>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_42 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.deque
-// RUN: diff -w %S/transitive_includes/expected.deque %t.actual.deque
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.deque %t.actual.deque
 #if defined(TEST_42)
 #include <deque>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_44 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.exception
-// RUN: diff -w %S/transitive_includes/expected.exception %t.actual.exception
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.exception %t.actual.exception
 #if defined(TEST_44)
 #include <exception>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_45 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.execution
-// RUN: diff -w %S/transitive_includes/expected.execution %t.actual.execution
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.execution %t.actual.execution
 #if defined(TEST_45)
 #include <execution>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_47 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.filesystem
-// RUN: diff -w %S/transitive_includes/expected.filesystem %t.actual.filesystem
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.filesystem %t.actual.filesystem
 #if defined(TEST_47)
 #include <filesystem>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_49 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.format
-// RUN: diff -w %S/transitive_includes/expected.format %t.actual.format
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.format %t.actual.format
 #if defined(TEST_49)
 #include <format>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_50 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.forward_list
-// RUN: diff -w %S/transitive_includes/expected.forward_list %t.actual.forward_list
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.forward_list %t.actual.forward_list
 #if defined(TEST_50)
 #include <forward_list>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_51 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.fstream
-// RUN: diff -w %S/transitive_includes/expected.fstream %t.actual.fstream
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.fstream %t.actual.fstream
 #if defined(TEST_51)
 #include <fstream>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_52 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.functional
-// RUN: diff -w %S/transitive_includes/expected.functional %t.actual.functional
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.functional %t.actual.functional
 #if defined(TEST_52)
 #include <functional>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_53 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.future
-// RUN: diff -w %S/transitive_includes/expected.future %t.actual.future
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.future %t.actual.future
 #if defined(TEST_53)
 #include <future>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_54 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.initializer_list
-// RUN: diff -w %S/transitive_includes/expected.initializer_list %t.actual.initializer_list
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.initializer_list %t.actual.initializer_list
 #if defined(TEST_54)
 #include <initializer_list>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_56 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iomanip
-// RUN: diff -w %S/transitive_includes/expected.iomanip %t.actual.iomanip
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.iomanip %t.actual.iomanip
 #if defined(TEST_56)
 #include <iomanip>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_57 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ios
-// RUN: diff -w %S/transitive_includes/expected.ios %t.actual.ios
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ios %t.actual.ios
 #if defined(TEST_57)
 #include <ios>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_58 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iosfwd
-// RUN: diff -w %S/transitive_includes/expected.iosfwd %t.actual.iosfwd
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.iosfwd %t.actual.iosfwd
 #if defined(TEST_58)
 #include <iosfwd>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_59 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iostream
-// RUN: diff -w %S/transitive_includes/expected.iostream %t.actual.iostream
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.iostream %t.actual.iostream
 #if defined(TEST_59)
 #include <iostream>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_60 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.istream
-// RUN: diff -w %S/transitive_includes/expected.istream %t.actual.istream
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.istream %t.actual.istream
 #if defined(TEST_60)
 #include <istream>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_61 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.iterator
-// RUN: diff -w %S/transitive_includes/expected.iterator %t.actual.iterator
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.iterator %t.actual.iterator
 #if defined(TEST_61)
 #include <iterator>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_62 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.latch
-// RUN: diff -w %S/transitive_includes/expected.latch %t.actual.latch
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.latch %t.actual.latch
 #if defined(TEST_62)
 #include <latch>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_63 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.limits
-// RUN: diff -w %S/transitive_includes/expected.limits %t.actual.limits
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.limits %t.actual.limits
 #if defined(TEST_63)
 #include <limits>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_65 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.list
-// RUN: diff -w %S/transitive_includes/expected.list %t.actual.list
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.list %t.actual.list
 #if defined(TEST_65)
 #include <list>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_66 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.locale
-// RUN: diff -w %S/transitive_includes/expected.locale %t.actual.locale
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.locale %t.actual.locale
 #if defined(TEST_66)
 #include <locale>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_68 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.map
-// RUN: diff -w %S/transitive_includes/expected.map %t.actual.map
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.map %t.actual.map
 #if defined(TEST_68)
 #include <map>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_70 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.memory
-// RUN: diff -w %S/transitive_includes/expected.memory %t.actual.memory
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.memory %t.actual.memory
 #if defined(TEST_70)
 #include <memory>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_71 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.mutex
-// RUN: diff -w %S/transitive_includes/expected.mutex %t.actual.mutex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.mutex %t.actual.mutex
 #if defined(TEST_71)
 #include <mutex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_72 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.new
-// RUN: diff -w %S/transitive_includes/expected.new %t.actual.new
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.new %t.actual.new
 #if defined(TEST_72)
 #include <new>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_73 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.numbers
-// RUN: diff -w %S/transitive_includes/expected.numbers %t.actual.numbers
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.numbers %t.actual.numbers
 #if defined(TEST_73)
 #include <numbers>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_74 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.numeric
-// RUN: diff -w %S/transitive_includes/expected.numeric %t.actual.numeric
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.numeric %t.actual.numeric
 #if defined(TEST_74)
 #include <numeric>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_75 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.optional
-// RUN: diff -w %S/transitive_includes/expected.optional %t.actual.optional
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.optional %t.actual.optional
 #if defined(TEST_75)
 #include <optional>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_76 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ostream
-// RUN: diff -w %S/transitive_includes/expected.ostream %t.actual.ostream
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ostream %t.actual.ostream
 #if defined(TEST_76)
 #include <ostream>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_77 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.queue
-// RUN: diff -w %S/transitive_includes/expected.queue %t.actual.queue
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.queue %t.actual.queue
 #if defined(TEST_77)
 #include <queue>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_78 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.random
-// RUN: diff -w %S/transitive_includes/expected.random %t.actual.random
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.random %t.actual.random
 #if defined(TEST_78)
 #include <random>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_79 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ranges
-// RUN: diff -w %S/transitive_includes/expected.ranges %t.actual.ranges
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ranges %t.actual.ranges
 #if defined(TEST_79)
 #include <ranges>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_80 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ratio
-// RUN: diff -w %S/transitive_includes/expected.ratio %t.actual.ratio
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ratio %t.actual.ratio
 #if defined(TEST_80)
 #include <ratio>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_81 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.regex
-// RUN: diff -w %S/transitive_includes/expected.regex %t.actual.regex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.regex %t.actual.regex
 #if defined(TEST_81)
 #include <regex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_82 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.scoped_allocator
-// RUN: diff -w %S/transitive_includes/expected.scoped_allocator %t.actual.scoped_allocator
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.scoped_allocator %t.actual.scoped_allocator
 #if defined(TEST_82)
 #include <scoped_allocator>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_83 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.semaphore
-// RUN: diff -w %S/transitive_includes/expected.semaphore %t.actual.semaphore
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.semaphore %t.actual.semaphore
 #if defined(TEST_83)
 #include <semaphore>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_84 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.set
-// RUN: diff -w %S/transitive_includes/expected.set %t.actual.set
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.set %t.actual.set
 #if defined(TEST_84)
 #include <set>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_86 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.shared_mutex
-// RUN: diff -w %S/transitive_includes/expected.shared_mutex %t.actual.shared_mutex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.shared_mutex %t.actual.shared_mutex
 #if defined(TEST_86)
 #include <shared_mutex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_87 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.span
-// RUN: diff -w %S/transitive_includes/expected.span %t.actual.span
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.span %t.actual.span
 #if defined(TEST_87)
 #include <span>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_88 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.sstream
-// RUN: diff -w %S/transitive_includes/expected.sstream %t.actual.sstream
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.sstream %t.actual.sstream
 #if defined(TEST_88)
 #include <sstream>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_89 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.stack
-// RUN: diff -w %S/transitive_includes/expected.stack %t.actual.stack
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.stack %t.actual.stack
 #if defined(TEST_89)
 #include <stack>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_93 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.stdexcept
-// RUN: diff -w %S/transitive_includes/expected.stdexcept %t.actual.stdexcept
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.stdexcept %t.actual.stdexcept
 #if defined(TEST_93)
 #include <stdexcept>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_97 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.streambuf
-// RUN: diff -w %S/transitive_includes/expected.streambuf %t.actual.streambuf
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.streambuf %t.actual.streambuf
 #if defined(TEST_97)
 #include <streambuf>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_98 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.string
-// RUN: diff -w %S/transitive_includes/expected.string %t.actual.string
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.string %t.actual.string
 #if defined(TEST_98)
 #include <string>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_100 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.string_view
-// RUN: diff -w %S/transitive_includes/expected.string_view %t.actual.string_view
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.string_view %t.actual.string_view
 #if defined(TEST_100)
 #include <string_view>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_101 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.strstream
-// RUN: diff -w %S/transitive_includes/expected.strstream %t.actual.strstream
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.strstream %t.actual.strstream
 #if defined(TEST_101)
 #include <strstream>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_102 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.system_error
-// RUN: diff -w %S/transitive_includes/expected.system_error %t.actual.system_error
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.system_error %t.actual.system_error
 #if defined(TEST_102)
 #include <system_error>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_104 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.thread
-// RUN: diff -w %S/transitive_includes/expected.thread %t.actual.thread
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.thread %t.actual.thread
 #if defined(TEST_104)
 #include <thread>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_105 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.tuple
-// RUN: diff -w %S/transitive_includes/expected.tuple %t.actual.tuple
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.tuple %t.actual.tuple
 #if defined(TEST_105)
 #include <tuple>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_106 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.type_traits
-// RUN: diff -w %S/transitive_includes/expected.type_traits %t.actual.type_traits
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.type_traits %t.actual.type_traits
 #if defined(TEST_106)
 #include <type_traits>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_107 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.typeindex
-// RUN: diff -w %S/transitive_includes/expected.typeindex %t.actual.typeindex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.typeindex %t.actual.typeindex
 #if defined(TEST_107)
 #include <typeindex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_108 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.typeinfo
-// RUN: diff -w %S/transitive_includes/expected.typeinfo %t.actual.typeinfo
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.typeinfo %t.actual.typeinfo
 #if defined(TEST_108)
 #include <typeinfo>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_110 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.unordered_map
-// RUN: diff -w %S/transitive_includes/expected.unordered_map %t.actual.unordered_map
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.unordered_map %t.actual.unordered_map
 #if defined(TEST_110)
 #include <unordered_map>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_111 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.unordered_set
-// RUN: diff -w %S/transitive_includes/expected.unordered_set %t.actual.unordered_set
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.unordered_set %t.actual.unordered_set
 #if defined(TEST_111)
 #include <unordered_set>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_112 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.utility
-// RUN: diff -w %S/transitive_includes/expected.utility %t.actual.utility
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.utility %t.actual.utility
 #if defined(TEST_112)
 #include <utility>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_113 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.valarray
-// RUN: diff -w %S/transitive_includes/expected.valarray %t.actual.valarray
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.valarray %t.actual.valarray
 #if defined(TEST_113)
 #include <valarray>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_114 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.variant
-// RUN: diff -w %S/transitive_includes/expected.variant %t.actual.variant
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.variant %t.actual.variant
 #if defined(TEST_114)
 #include <variant>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_115 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.vector
-// RUN: diff -w %S/transitive_includes/expected.vector %t.actual.vector
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.vector %t.actual.vector
 #if defined(TEST_115)
 #include <vector>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_116 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.version
-// RUN: diff -w %S/transitive_includes/expected.version %t.actual.version
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.version %t.actual.version
 #if defined(TEST_116)
 #include <version>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_119 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_algorithm
-// RUN: diff -w %S/transitive_includes/expected.experimental_algorithm %t.actual.experimental_algorithm
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_algorithm %t.actual.experimental_algorithm
 #if defined(TEST_119)
 #include <experimental/algorithm>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_120 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_coroutine
-// RUN: diff -w %S/transitive_includes/expected.experimental_coroutine %t.actual.experimental_coroutine
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_coroutine %t.actual.experimental_coroutine
 #if defined(TEST_120)
 #include <experimental/coroutine>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_121 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_deque
-// RUN: diff -w %S/transitive_includes/expected.experimental_deque %t.actual.experimental_deque
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_deque %t.actual.experimental_deque
 #if defined(TEST_121)
 #include <experimental/deque>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_122 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_forward_list
-// RUN: diff -w %S/transitive_includes/expected.experimental_forward_list %t.actual.experimental_forward_list
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_forward_list %t.actual.experimental_forward_list
 #if defined(TEST_122)
 #include <experimental/forward_list>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_123 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_functional
-// RUN: diff -w %S/transitive_includes/expected.experimental_functional %t.actual.experimental_functional
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_functional %t.actual.experimental_functional
 #if defined(TEST_123)
 #include <experimental/functional>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_124 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_iterator
-// RUN: diff -w %S/transitive_includes/expected.experimental_iterator %t.actual.experimental_iterator
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_iterator %t.actual.experimental_iterator
 #if defined(TEST_124)
 #include <experimental/iterator>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_125 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_list
-// RUN: diff -w %S/transitive_includes/expected.experimental_list %t.actual.experimental_list
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_list %t.actual.experimental_list
 #if defined(TEST_125)
 #include <experimental/list>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_126 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_map
-// RUN: diff -w %S/transitive_includes/expected.experimental_map %t.actual.experimental_map
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_map %t.actual.experimental_map
 #if defined(TEST_126)
 #include <experimental/map>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_127 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_memory_resource
-// RUN: diff -w %S/transitive_includes/expected.experimental_memory_resource %t.actual.experimental_memory_resource
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_memory_resource %t.actual.experimental_memory_resource
 #if defined(TEST_127)
 #include <experimental/memory_resource>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_128 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_propagate_const
-// RUN: diff -w %S/transitive_includes/expected.experimental_propagate_const %t.actual.experimental_propagate_const
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_propagate_const %t.actual.experimental_propagate_const
 #if defined(TEST_128)
 #include <experimental/propagate_const>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_129 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_regex
-// RUN: diff -w %S/transitive_includes/expected.experimental_regex %t.actual.experimental_regex
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_regex %t.actual.experimental_regex
 #if defined(TEST_129)
 #include <experimental/regex>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_130 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_set
-// RUN: diff -w %S/transitive_includes/expected.experimental_set %t.actual.experimental_set
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_set %t.actual.experimental_set
 #if defined(TEST_130)
 #include <experimental/set>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_131 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_simd
-// RUN: diff -w %S/transitive_includes/expected.experimental_simd %t.actual.experimental_simd
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_simd %t.actual.experimental_simd
 #if defined(TEST_131)
 #include <experimental/simd>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_132 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_string
-// RUN: diff -w %S/transitive_includes/expected.experimental_string %t.actual.experimental_string
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_string %t.actual.experimental_string
 #if defined(TEST_132)
 #include <experimental/string>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_133 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_type_traits
-// RUN: diff -w %S/transitive_includes/expected.experimental_type_traits %t.actual.experimental_type_traits
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_type_traits %t.actual.experimental_type_traits
 #if defined(TEST_133)
 #include <experimental/type_traits>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_134 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_unordered_map
-// RUN: diff -w %S/transitive_includes/expected.experimental_unordered_map %t.actual.experimental_unordered_map
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_unordered_map %t.actual.experimental_unordered_map
 #if defined(TEST_134)
 #include <experimental/unordered_map>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_135 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_unordered_set
-// RUN: diff -w %S/transitive_includes/expected.experimental_unordered_set %t.actual.experimental_unordered_set
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_unordered_set %t.actual.experimental_unordered_set
 #if defined(TEST_135)
 #include <experimental/unordered_set>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_136 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_utility
-// RUN: diff -w %S/transitive_includes/expected.experimental_utility %t.actual.experimental_utility
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_utility %t.actual.experimental_utility
 #if defined(TEST_136)
 #include <experimental/utility>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_137 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.experimental_vector
-// RUN: diff -w %S/transitive_includes/expected.experimental_vector %t.actual.experimental_vector
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.experimental_vector %t.actual.experimental_vector
 #if defined(TEST_137)
 #include <experimental/vector>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_138 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ext_hash_map
-// RUN: diff -w %S/transitive_includes/expected.ext_hash_map %t.actual.ext_hash_map
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ext_hash_map %t.actual.ext_hash_map
 #if defined(TEST_138)
 #include <ext/hash_map>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fsyntax-only -DTEST_139 2>&1 | %{python} %S/transitive_includes.sanitize.py > %t.actual.ext_hash_set
-// RUN: diff -w %S/transitive_includes/expected.ext_hash_set %t.actual.ext_hash_set
+// RUN: diff -w %S/transitive_includes/%{cxx_std}/expected.ext_hash_set %t.actual.ext_hash_set
 #if defined(TEST_139)
 #include <ext/hash_set>
 #endif
diff --git a/libcxx/test/libcxx/transitive_includes/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
rename from libcxx/test/libcxx/transitive_includes/expected.algorithm
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.any b/libcxx/test/libcxx/transitive_includes/cxx11/expected.any
rename from libcxx/test/libcxx/transitive_includes/expected.any
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.any
diff --git a/libcxx/test/libcxx/transitive_includes/expected.array b/libcxx/test/libcxx/transitive_includes/cxx11/expected.array
rename from libcxx/test/libcxx/transitive_includes/expected.array
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.array
diff --git a/libcxx/test/libcxx/transitive_includes/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
rename from libcxx/test/libcxx/transitive_includes/expected.atomic
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.atomic
diff --git a/libcxx/test/libcxx/transitive_includes/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
rename from libcxx/test/libcxx/transitive_includes/expected.barrier
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.barrier
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
rename from libcxx/test/libcxx/transitive_includes/expected.bit
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.bit
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
rename from libcxx/test/libcxx/transitive_includes/expected.bitset
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.bitset
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
rename from libcxx/test/libcxx/transitive_includes/expected.cassert
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cassert
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
rename from libcxx/test/libcxx/transitive_includes/expected.ccomplex
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ccomplex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
rename from libcxx/test/libcxx/transitive_includes/expected.cctype
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
rename from libcxx/test/libcxx/transitive_includes/expected.cerrno
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cerrno
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
rename from libcxx/test/libcxx/transitive_includes/expected.cfenv
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cfenv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
rename from libcxx/test/libcxx/transitive_includes/expected.cfloat
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cfloat
diff --git a/libcxx/test/libcxx/transitive_includes/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
rename from libcxx/test/libcxx/transitive_includes/expected.charconv
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.charconv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
rename from libcxx/test/libcxx/transitive_includes/expected.chrono
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.chrono
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
rename from libcxx/test/libcxx/transitive_includes/expected.cinttypes
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cinttypes
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
rename from libcxx/test/libcxx/transitive_includes/expected.ciso646
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ciso646
diff --git a/libcxx/test/libcxx/transitive_includes/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
rename from libcxx/test/libcxx/transitive_includes/expected.climits
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.climits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
rename from libcxx/test/libcxx/transitive_includes/expected.clocale
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.clocale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
rename from libcxx/test/libcxx/transitive_includes/expected.cmath
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
rename from libcxx/test/libcxx/transitive_includes/expected.codecvt
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.codecvt
diff --git a/libcxx/test/libcxx/transitive_includes/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
rename from libcxx/test/libcxx/transitive_includes/expected.compare
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.compare
diff --git a/libcxx/test/libcxx/transitive_includes/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
rename from libcxx/test/libcxx/transitive_includes/expected.complex
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.complex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
rename from libcxx/test/libcxx/transitive_includes/expected.concepts
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.concepts
diff --git a/libcxx/test/libcxx/transitive_includes/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
rename from libcxx/test/libcxx/transitive_includes/expected.condition_variable
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.condition_variable
diff --git a/libcxx/test/libcxx/transitive_includes/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
rename from libcxx/test/libcxx/transitive_includes/expected.coroutine
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
rename from libcxx/test/libcxx/transitive_includes/expected.csetjmp
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.csetjmp
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
rename from libcxx/test/libcxx/transitive_includes/expected.csignal
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.csignal
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
rename from libcxx/test/libcxx/transitive_includes/expected.cstdarg
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdarg
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
rename from libcxx/test/libcxx/transitive_includes/expected.cstdbool
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdbool
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
rename from libcxx/test/libcxx/transitive_includes/expected.cstddef
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
rename from libcxx/test/libcxx/transitive_includes/expected.cstdint
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
rename from libcxx/test/libcxx/transitive_includes/expected.cstdio
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
rename from libcxx/test/libcxx/transitive_includes/expected.cstdlib
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
rename from libcxx/test/libcxx/transitive_includes/expected.cstring
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cstring
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
rename from libcxx/test/libcxx/transitive_includes/expected.ctgmath
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ctgmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
rename from libcxx/test/libcxx/transitive_includes/expected.ctime
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ctime
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
rename from libcxx/test/libcxx/transitive_includes/expected.cuchar
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cuchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
rename from libcxx/test/libcxx/transitive_includes/expected.cwchar
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cwchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
rename from libcxx/test/libcxx/transitive_includes/expected.cwctype
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
rename from libcxx/test/libcxx/transitive_includes/expected.deque
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
rename from libcxx/test/libcxx/transitive_includes/expected.exception
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.exception
diff --git a/libcxx/test/libcxx/transitive_includes/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
rename from libcxx/test/libcxx/transitive_includes/expected.execution
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.execution
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_deque
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_functional
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_iterator
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_list
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_map
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_memory_resource
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_propagate_const
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_regex
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_set
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_simd
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_simd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_string
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_string
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
new file mode 100644
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_type_traits
@@ -0,0 +1 @@
+experimental/type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_utility
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_vector
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.experimental_vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
rename from libcxx/test/libcxx/transitive_includes/expected.ext_hash_map
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
rename from libcxx/test/libcxx/transitive_includes/expected.ext_hash_set
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ext_hash_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
rename from libcxx/test/libcxx/transitive_includes/expected.filesystem
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.filesystem
diff --git a/libcxx/test/libcxx/transitive_includes/expected.format b/libcxx/test/libcxx/transitive_includes/cxx11/expected.format
rename from libcxx/test/libcxx/transitive_includes/expected.format
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.format
diff --git a/libcxx/test/libcxx/transitive_includes/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
rename from libcxx/test/libcxx/transitive_includes/expected.forward_list
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
rename from libcxx/test/libcxx/transitive_includes/expected.fstream
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.fstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
rename from libcxx/test/libcxx/transitive_includes/expected.functional
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.future b/libcxx/test/libcxx/transitive_includes/cxx11/expected.future
rename from libcxx/test/libcxx/transitive_includes/expected.future
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.future
diff --git a/libcxx/test/libcxx/transitive_includes/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
rename from libcxx/test/libcxx/transitive_includes/expected.initializer_list
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
rename from libcxx/test/libcxx/transitive_includes/expected.iomanip
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
rename from libcxx/test/libcxx/transitive_includes/expected.ios
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ios
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
rename from libcxx/test/libcxx/transitive_includes/expected.iosfwd
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
rename from libcxx/test/libcxx/transitive_includes/expected.iostream
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.iostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
rename from libcxx/test/libcxx/transitive_includes/expected.istream
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.istream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
rename from libcxx/test/libcxx/transitive_includes/expected.iterator
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
rename from libcxx/test/libcxx/transitive_includes/expected.latch
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.latch
diff --git a/libcxx/test/libcxx/transitive_includes/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
rename from libcxx/test/libcxx/transitive_includes/expected.limits
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.limits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.list b/libcxx/test/libcxx/transitive_includes/cxx11/expected.list
rename from libcxx/test/libcxx/transitive_includes/expected.list
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
rename from libcxx/test/libcxx/transitive_includes/expected.locale
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.locale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.map
rename from libcxx/test/libcxx/transitive_includes/expected.map
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
rename from libcxx/test/libcxx/transitive_includes/expected.memory
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.memory
diff --git a/libcxx/test/libcxx/transitive_includes/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
rename from libcxx/test/libcxx/transitive_includes/expected.mutex
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.new b/libcxx/test/libcxx/transitive_includes/cxx11/expected.new
rename from libcxx/test/libcxx/transitive_includes/expected.new
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.new
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
rename from libcxx/test/libcxx/transitive_includes/expected.numbers
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.numbers
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
rename from libcxx/test/libcxx/transitive_includes/expected.numeric
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.numeric
diff --git a/libcxx/test/libcxx/transitive_includes/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
rename from libcxx/test/libcxx/transitive_includes/expected.optional
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.optional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
rename from libcxx/test/libcxx/transitive_includes/expected.ostream
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
rename from libcxx/test/libcxx/transitive_includes/expected.queue
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.queue
diff --git a/libcxx/test/libcxx/transitive_includes/expected.random b/libcxx/test/libcxx/transitive_includes/cxx11/expected.random
rename from libcxx/test/libcxx/transitive_includes/expected.random
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.random
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
rename from libcxx/test/libcxx/transitive_includes/expected.ranges
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ranges
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
rename from libcxx/test/libcxx/transitive_includes/expected.ratio
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.ratio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
rename from libcxx/test/libcxx/transitive_includes/expected.regex
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
rename from libcxx/test/libcxx/transitive_includes/expected.scoped_allocator
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.scoped_allocator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
rename from libcxx/test/libcxx/transitive_includes/expected.semaphore
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.semaphore
diff --git a/libcxx/test/libcxx/transitive_includes/expected.set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.set
rename from libcxx/test/libcxx/transitive_includes/expected.set
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.set
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
new file mode 100644
--- /dev/null
+++ b/libcxx/test/libcxx/transitive_includes/cxx11/expected.shared_mutex
@@ -0,0 +1,2 @@
+shared_mutex
+version
diff --git a/libcxx/test/libcxx/transitive_includes/expected.span b/libcxx/test/libcxx/transitive_includes/cxx11/expected.span
rename from libcxx/test/libcxx/transitive_includes/expected.span
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.span
diff --git a/libcxx/test/libcxx/transitive_includes/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
rename from libcxx/test/libcxx/transitive_includes/expected.sstream
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.sstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
rename from libcxx/test/libcxx/transitive_includes/expected.stack
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.stack
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
rename from libcxx/test/libcxx/transitive_includes/expected.stdexcept
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
rename from libcxx/test/libcxx/transitive_includes/expected.streambuf
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string
rename from libcxx/test/libcxx/transitive_includes/expected.string
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
rename from libcxx/test/libcxx/transitive_includes/expected.string_view
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.string_view
diff --git a/libcxx/test/libcxx/transitive_includes/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
rename from libcxx/test/libcxx/transitive_includes/expected.strstream
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.strstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
rename from libcxx/test/libcxx/transitive_includes/expected.system_error
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.system_error
diff --git a/libcxx/test/libcxx/transitive_includes/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
rename from libcxx/test/libcxx/transitive_includes/expected.thread
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.thread
diff --git a/libcxx/test/libcxx/transitive_includes/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
rename from libcxx/test/libcxx/transitive_includes/expected.tuple
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.tuple
diff --git a/libcxx/test/libcxx/transitive_includes/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
rename from libcxx/test/libcxx/transitive_includes/expected.type_traits
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
rename from libcxx/test/libcxx/transitive_includes/expected.typeindex
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.typeindex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
rename from libcxx/test/libcxx/transitive_includes/expected.typeinfo
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
rename from libcxx/test/libcxx/transitive_includes/expected.unordered_map
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
rename from libcxx/test/libcxx/transitive_includes/expected.unordered_set
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
rename from libcxx/test/libcxx/transitive_includes/expected.utility
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
rename from libcxx/test/libcxx/transitive_includes/expected.valarray
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.valarray
diff --git a/libcxx/test/libcxx/transitive_includes/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
rename from libcxx/test/libcxx/transitive_includes/expected.variant
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.variant
diff --git a/libcxx/test/libcxx/transitive_includes/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
rename from libcxx/test/libcxx/transitive_includes/expected.vector
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.version b/libcxx/test/libcxx/transitive_includes/cxx11/expected.version
rename from libcxx/test/libcxx/transitive_includes/expected.version
rename to libcxx/test/libcxx/transitive_includes/cxx11/expected.version
diff --git a/libcxx/test/libcxx/transitive_includes/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
copy from libcxx/test/libcxx/transitive_includes/expected.algorithm
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.any b/libcxx/test/libcxx/transitive_includes/cxx14/expected.any
copy from libcxx/test/libcxx/transitive_includes/expected.any
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.any
diff --git a/libcxx/test/libcxx/transitive_includes/expected.array b/libcxx/test/libcxx/transitive_includes/cxx14/expected.array
copy from libcxx/test/libcxx/transitive_includes/expected.array
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.array
diff --git a/libcxx/test/libcxx/transitive_includes/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
copy from libcxx/test/libcxx/transitive_includes/expected.atomic
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.atomic
diff --git a/libcxx/test/libcxx/transitive_includes/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
copy from libcxx/test/libcxx/transitive_includes/expected.barrier
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.barrier
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
copy from libcxx/test/libcxx/transitive_includes/expected.bit
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.bit
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
copy from libcxx/test/libcxx/transitive_includes/expected.bitset
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.bitset
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
copy from libcxx/test/libcxx/transitive_includes/expected.cassert
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cassert
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
copy from libcxx/test/libcxx/transitive_includes/expected.ccomplex
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ccomplex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
copy from libcxx/test/libcxx/transitive_includes/expected.cctype
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
copy from libcxx/test/libcxx/transitive_includes/expected.cerrno
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cerrno
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
copy from libcxx/test/libcxx/transitive_includes/expected.cfenv
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cfenv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
copy from libcxx/test/libcxx/transitive_includes/expected.cfloat
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cfloat
diff --git a/libcxx/test/libcxx/transitive_includes/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
copy from libcxx/test/libcxx/transitive_includes/expected.charconv
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.charconv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
copy from libcxx/test/libcxx/transitive_includes/expected.chrono
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.chrono
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
copy from libcxx/test/libcxx/transitive_includes/expected.cinttypes
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cinttypes
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
copy from libcxx/test/libcxx/transitive_includes/expected.ciso646
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ciso646
diff --git a/libcxx/test/libcxx/transitive_includes/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
copy from libcxx/test/libcxx/transitive_includes/expected.climits
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.climits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
copy from libcxx/test/libcxx/transitive_includes/expected.clocale
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.clocale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
copy from libcxx/test/libcxx/transitive_includes/expected.cmath
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
copy from libcxx/test/libcxx/transitive_includes/expected.codecvt
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.codecvt
diff --git a/libcxx/test/libcxx/transitive_includes/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
copy from libcxx/test/libcxx/transitive_includes/expected.compare
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.compare
diff --git a/libcxx/test/libcxx/transitive_includes/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
copy from libcxx/test/libcxx/transitive_includes/expected.complex
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.complex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
copy from libcxx/test/libcxx/transitive_includes/expected.concepts
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.concepts
diff --git a/libcxx/test/libcxx/transitive_includes/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
copy from libcxx/test/libcxx/transitive_includes/expected.condition_variable
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.condition_variable
diff --git a/libcxx/test/libcxx/transitive_includes/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
copy from libcxx/test/libcxx/transitive_includes/expected.coroutine
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
copy from libcxx/test/libcxx/transitive_includes/expected.csetjmp
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.csetjmp
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
copy from libcxx/test/libcxx/transitive_includes/expected.csignal
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.csignal
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
copy from libcxx/test/libcxx/transitive_includes/expected.cstdarg
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdarg
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
copy from libcxx/test/libcxx/transitive_includes/expected.cstdbool
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdbool
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
copy from libcxx/test/libcxx/transitive_includes/expected.cstddef
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
copy from libcxx/test/libcxx/transitive_includes/expected.cstdint
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
copy from libcxx/test/libcxx/transitive_includes/expected.cstdio
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
copy from libcxx/test/libcxx/transitive_includes/expected.cstdlib
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
copy from libcxx/test/libcxx/transitive_includes/expected.cstring
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cstring
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
copy from libcxx/test/libcxx/transitive_includes/expected.ctgmath
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ctgmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
copy from libcxx/test/libcxx/transitive_includes/expected.ctime
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ctime
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
copy from libcxx/test/libcxx/transitive_includes/expected.cuchar
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cuchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
copy from libcxx/test/libcxx/transitive_includes/expected.cwchar
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cwchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
copy from libcxx/test/libcxx/transitive_includes/expected.cwctype
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
copy from libcxx/test/libcxx/transitive_includes/expected.deque
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
copy from libcxx/test/libcxx/transitive_includes/expected.exception
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.exception
diff --git a/libcxx/test/libcxx/transitive_includes/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
copy from libcxx/test/libcxx/transitive_includes/expected.execution
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.execution
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_deque
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_functional
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_iterator
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_list
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_map
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_memory_resource
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_propagate_const
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_regex
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_set
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_simd
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_simd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_string
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits
rename to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_utility
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_vector
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.experimental_vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
copy from libcxx/test/libcxx/transitive_includes/expected.ext_hash_map
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
copy from libcxx/test/libcxx/transitive_includes/expected.ext_hash_set
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ext_hash_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
copy from libcxx/test/libcxx/transitive_includes/expected.filesystem
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.filesystem
diff --git a/libcxx/test/libcxx/transitive_includes/expected.format b/libcxx/test/libcxx/transitive_includes/cxx14/expected.format
copy from libcxx/test/libcxx/transitive_includes/expected.format
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.format
diff --git a/libcxx/test/libcxx/transitive_includes/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
copy from libcxx/test/libcxx/transitive_includes/expected.forward_list
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
copy from libcxx/test/libcxx/transitive_includes/expected.fstream
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.fstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
copy from libcxx/test/libcxx/transitive_includes/expected.functional
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.future b/libcxx/test/libcxx/transitive_includes/cxx14/expected.future
copy from libcxx/test/libcxx/transitive_includes/expected.future
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.future
diff --git a/libcxx/test/libcxx/transitive_includes/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
copy from libcxx/test/libcxx/transitive_includes/expected.initializer_list
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
copy from libcxx/test/libcxx/transitive_includes/expected.iomanip
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
copy from libcxx/test/libcxx/transitive_includes/expected.ios
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ios
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
copy from libcxx/test/libcxx/transitive_includes/expected.iosfwd
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
copy from libcxx/test/libcxx/transitive_includes/expected.iostream
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.iostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
copy from libcxx/test/libcxx/transitive_includes/expected.istream
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.istream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
copy from libcxx/test/libcxx/transitive_includes/expected.iterator
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
copy from libcxx/test/libcxx/transitive_includes/expected.latch
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.latch
diff --git a/libcxx/test/libcxx/transitive_includes/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
copy from libcxx/test/libcxx/transitive_includes/expected.limits
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.limits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.list b/libcxx/test/libcxx/transitive_includes/cxx14/expected.list
copy from libcxx/test/libcxx/transitive_includes/expected.list
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
copy from libcxx/test/libcxx/transitive_includes/expected.locale
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.locale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.map
copy from libcxx/test/libcxx/transitive_includes/expected.map
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
copy from libcxx/test/libcxx/transitive_includes/expected.memory
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.memory
diff --git a/libcxx/test/libcxx/transitive_includes/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
copy from libcxx/test/libcxx/transitive_includes/expected.mutex
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.new b/libcxx/test/libcxx/transitive_includes/cxx14/expected.new
copy from libcxx/test/libcxx/transitive_includes/expected.new
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.new
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
copy from libcxx/test/libcxx/transitive_includes/expected.numbers
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.numbers
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
copy from libcxx/test/libcxx/transitive_includes/expected.numeric
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.numeric
diff --git a/libcxx/test/libcxx/transitive_includes/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
copy from libcxx/test/libcxx/transitive_includes/expected.optional
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.optional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
copy from libcxx/test/libcxx/transitive_includes/expected.ostream
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
copy from libcxx/test/libcxx/transitive_includes/expected.queue
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.queue
diff --git a/libcxx/test/libcxx/transitive_includes/expected.random b/libcxx/test/libcxx/transitive_includes/cxx14/expected.random
copy from libcxx/test/libcxx/transitive_includes/expected.random
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.random
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
copy from libcxx/test/libcxx/transitive_includes/expected.ranges
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ranges
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
copy from libcxx/test/libcxx/transitive_includes/expected.ratio
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.ratio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
copy from libcxx/test/libcxx/transitive_includes/expected.regex
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
copy from libcxx/test/libcxx/transitive_includes/expected.scoped_allocator
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.scoped_allocator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
copy from libcxx/test/libcxx/transitive_includes/expected.semaphore
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.semaphore
diff --git a/libcxx/test/libcxx/transitive_includes/expected.set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.set
copy from libcxx/test/libcxx/transitive_includes/expected.set
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
rename from libcxx/test/libcxx/transitive_includes/expected.shared_mutex
rename to libcxx/test/libcxx/transitive_includes/cxx14/expected.shared_mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.span b/libcxx/test/libcxx/transitive_includes/cxx14/expected.span
copy from libcxx/test/libcxx/transitive_includes/expected.span
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.span
diff --git a/libcxx/test/libcxx/transitive_includes/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
copy from libcxx/test/libcxx/transitive_includes/expected.sstream
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.sstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
copy from libcxx/test/libcxx/transitive_includes/expected.stack
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.stack
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
copy from libcxx/test/libcxx/transitive_includes/expected.stdexcept
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
copy from libcxx/test/libcxx/transitive_includes/expected.streambuf
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string
copy from libcxx/test/libcxx/transitive_includes/expected.string
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
copy from libcxx/test/libcxx/transitive_includes/expected.string_view
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.string_view
diff --git a/libcxx/test/libcxx/transitive_includes/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
copy from libcxx/test/libcxx/transitive_includes/expected.strstream
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.strstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
copy from libcxx/test/libcxx/transitive_includes/expected.system_error
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.system_error
diff --git a/libcxx/test/libcxx/transitive_includes/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
copy from libcxx/test/libcxx/transitive_includes/expected.thread
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.thread
diff --git a/libcxx/test/libcxx/transitive_includes/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
copy from libcxx/test/libcxx/transitive_includes/expected.tuple
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.tuple
diff --git a/libcxx/test/libcxx/transitive_includes/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
copy from libcxx/test/libcxx/transitive_includes/expected.type_traits
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
copy from libcxx/test/libcxx/transitive_includes/expected.typeindex
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.typeindex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
copy from libcxx/test/libcxx/transitive_includes/expected.typeinfo
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
copy from libcxx/test/libcxx/transitive_includes/expected.unordered_map
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
copy from libcxx/test/libcxx/transitive_includes/expected.unordered_set
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
copy from libcxx/test/libcxx/transitive_includes/expected.utility
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
copy from libcxx/test/libcxx/transitive_includes/expected.valarray
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.valarray
diff --git a/libcxx/test/libcxx/transitive_includes/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
copy from libcxx/test/libcxx/transitive_includes/expected.variant
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.variant
diff --git a/libcxx/test/libcxx/transitive_includes/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
copy from libcxx/test/libcxx/transitive_includes/expected.vector
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.version b/libcxx/test/libcxx/transitive_includes/cxx14/expected.version
copy from libcxx/test/libcxx/transitive_includes/expected.version
copy to libcxx/test/libcxx/transitive_includes/cxx14/expected.version
diff --git a/libcxx/test/libcxx/transitive_includes/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
copy from libcxx/test/libcxx/transitive_includes/expected.algorithm
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.any b/libcxx/test/libcxx/transitive_includes/cxx17/expected.any
copy from libcxx/test/libcxx/transitive_includes/expected.any
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.any
diff --git a/libcxx/test/libcxx/transitive_includes/expected.array b/libcxx/test/libcxx/transitive_includes/cxx17/expected.array
copy from libcxx/test/libcxx/transitive_includes/expected.array
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.array
diff --git a/libcxx/test/libcxx/transitive_includes/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
copy from libcxx/test/libcxx/transitive_includes/expected.atomic
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.atomic
diff --git a/libcxx/test/libcxx/transitive_includes/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
copy from libcxx/test/libcxx/transitive_includes/expected.barrier
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.barrier
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
copy from libcxx/test/libcxx/transitive_includes/expected.bit
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.bit
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
copy from libcxx/test/libcxx/transitive_includes/expected.bitset
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.bitset
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
copy from libcxx/test/libcxx/transitive_includes/expected.cassert
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cassert
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
copy from libcxx/test/libcxx/transitive_includes/expected.ccomplex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ccomplex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
copy from libcxx/test/libcxx/transitive_includes/expected.cctype
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
copy from libcxx/test/libcxx/transitive_includes/expected.cerrno
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cerrno
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
copy from libcxx/test/libcxx/transitive_includes/expected.cfenv
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cfenv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
copy from libcxx/test/libcxx/transitive_includes/expected.cfloat
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cfloat
diff --git a/libcxx/test/libcxx/transitive_includes/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
copy from libcxx/test/libcxx/transitive_includes/expected.charconv
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.charconv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
copy from libcxx/test/libcxx/transitive_includes/expected.chrono
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.chrono
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
copy from libcxx/test/libcxx/transitive_includes/expected.cinttypes
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cinttypes
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
copy from libcxx/test/libcxx/transitive_includes/expected.ciso646
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ciso646
diff --git a/libcxx/test/libcxx/transitive_includes/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
copy from libcxx/test/libcxx/transitive_includes/expected.climits
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.climits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
copy from libcxx/test/libcxx/transitive_includes/expected.clocale
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.clocale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
copy from libcxx/test/libcxx/transitive_includes/expected.cmath
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
copy from libcxx/test/libcxx/transitive_includes/expected.codecvt
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.codecvt
diff --git a/libcxx/test/libcxx/transitive_includes/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
copy from libcxx/test/libcxx/transitive_includes/expected.compare
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.compare
diff --git a/libcxx/test/libcxx/transitive_includes/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
copy from libcxx/test/libcxx/transitive_includes/expected.complex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.complex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
copy from libcxx/test/libcxx/transitive_includes/expected.concepts
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.concepts
diff --git a/libcxx/test/libcxx/transitive_includes/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
copy from libcxx/test/libcxx/transitive_includes/expected.condition_variable
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.condition_variable
diff --git a/libcxx/test/libcxx/transitive_includes/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
copy from libcxx/test/libcxx/transitive_includes/expected.coroutine
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
copy from libcxx/test/libcxx/transitive_includes/expected.csetjmp
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.csetjmp
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
copy from libcxx/test/libcxx/transitive_includes/expected.csignal
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.csignal
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
copy from libcxx/test/libcxx/transitive_includes/expected.cstdarg
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdarg
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
copy from libcxx/test/libcxx/transitive_includes/expected.cstdbool
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdbool
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
copy from libcxx/test/libcxx/transitive_includes/expected.cstddef
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
copy from libcxx/test/libcxx/transitive_includes/expected.cstdint
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
copy from libcxx/test/libcxx/transitive_includes/expected.cstdio
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
copy from libcxx/test/libcxx/transitive_includes/expected.cstdlib
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
copy from libcxx/test/libcxx/transitive_includes/expected.cstring
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cstring
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
copy from libcxx/test/libcxx/transitive_includes/expected.ctgmath
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ctgmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
copy from libcxx/test/libcxx/transitive_includes/expected.ctime
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ctime
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
copy from libcxx/test/libcxx/transitive_includes/expected.cuchar
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cuchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
copy from libcxx/test/libcxx/transitive_includes/expected.cwchar
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cwchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
copy from libcxx/test/libcxx/transitive_includes/expected.cwctype
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
copy from libcxx/test/libcxx/transitive_includes/expected.deque
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
copy from libcxx/test/libcxx/transitive_includes/expected.exception
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.exception
diff --git a/libcxx/test/libcxx/transitive_includes/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
copy from libcxx/test/libcxx/transitive_includes/expected.execution
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.execution
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_deque
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_functional
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_iterator
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_list
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_map
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_memory_resource
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_propagate_const
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_regex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_set
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_simd
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_simd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_string
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_utility
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_vector
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.experimental_vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
copy from libcxx/test/libcxx/transitive_includes/expected.ext_hash_map
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
copy from libcxx/test/libcxx/transitive_includes/expected.ext_hash_set
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ext_hash_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
copy from libcxx/test/libcxx/transitive_includes/expected.filesystem
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.filesystem
diff --git a/libcxx/test/libcxx/transitive_includes/expected.format b/libcxx/test/libcxx/transitive_includes/cxx17/expected.format
copy from libcxx/test/libcxx/transitive_includes/expected.format
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.format
diff --git a/libcxx/test/libcxx/transitive_includes/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
copy from libcxx/test/libcxx/transitive_includes/expected.forward_list
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
copy from libcxx/test/libcxx/transitive_includes/expected.fstream
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.fstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
copy from libcxx/test/libcxx/transitive_includes/expected.functional
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.future b/libcxx/test/libcxx/transitive_includes/cxx17/expected.future
copy from libcxx/test/libcxx/transitive_includes/expected.future
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.future
diff --git a/libcxx/test/libcxx/transitive_includes/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
copy from libcxx/test/libcxx/transitive_includes/expected.initializer_list
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
copy from libcxx/test/libcxx/transitive_includes/expected.iomanip
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
copy from libcxx/test/libcxx/transitive_includes/expected.ios
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ios
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
copy from libcxx/test/libcxx/transitive_includes/expected.iosfwd
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
copy from libcxx/test/libcxx/transitive_includes/expected.iostream
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.iostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
copy from libcxx/test/libcxx/transitive_includes/expected.istream
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.istream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
copy from libcxx/test/libcxx/transitive_includes/expected.iterator
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
copy from libcxx/test/libcxx/transitive_includes/expected.latch
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.latch
diff --git a/libcxx/test/libcxx/transitive_includes/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
copy from libcxx/test/libcxx/transitive_includes/expected.limits
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.limits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.list b/libcxx/test/libcxx/transitive_includes/cxx17/expected.list
copy from libcxx/test/libcxx/transitive_includes/expected.list
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
copy from libcxx/test/libcxx/transitive_includes/expected.locale
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.locale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.map
copy from libcxx/test/libcxx/transitive_includes/expected.map
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
copy from libcxx/test/libcxx/transitive_includes/expected.memory
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.memory
diff --git a/libcxx/test/libcxx/transitive_includes/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
copy from libcxx/test/libcxx/transitive_includes/expected.mutex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.new b/libcxx/test/libcxx/transitive_includes/cxx17/expected.new
copy from libcxx/test/libcxx/transitive_includes/expected.new
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.new
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
copy from libcxx/test/libcxx/transitive_includes/expected.numbers
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.numbers
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
copy from libcxx/test/libcxx/transitive_includes/expected.numeric
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.numeric
diff --git a/libcxx/test/libcxx/transitive_includes/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
copy from libcxx/test/libcxx/transitive_includes/expected.optional
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.optional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
copy from libcxx/test/libcxx/transitive_includes/expected.ostream
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
copy from libcxx/test/libcxx/transitive_includes/expected.queue
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.queue
diff --git a/libcxx/test/libcxx/transitive_includes/expected.random b/libcxx/test/libcxx/transitive_includes/cxx17/expected.random
copy from libcxx/test/libcxx/transitive_includes/expected.random
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.random
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
copy from libcxx/test/libcxx/transitive_includes/expected.ranges
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ranges
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
copy from libcxx/test/libcxx/transitive_includes/expected.ratio
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.ratio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
copy from libcxx/test/libcxx/transitive_includes/expected.regex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
copy from libcxx/test/libcxx/transitive_includes/expected.scoped_allocator
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.scoped_allocator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
copy from libcxx/test/libcxx/transitive_includes/expected.semaphore
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.semaphore
diff --git a/libcxx/test/libcxx/transitive_includes/expected.set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.set
copy from libcxx/test/libcxx/transitive_includes/expected.set
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
copy from libcxx/test/libcxx/transitive_includes/expected.shared_mutex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.shared_mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.span b/libcxx/test/libcxx/transitive_includes/cxx17/expected.span
copy from libcxx/test/libcxx/transitive_includes/expected.span
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.span
diff --git a/libcxx/test/libcxx/transitive_includes/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
copy from libcxx/test/libcxx/transitive_includes/expected.sstream
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.sstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
copy from libcxx/test/libcxx/transitive_includes/expected.stack
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.stack
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
copy from libcxx/test/libcxx/transitive_includes/expected.stdexcept
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
copy from libcxx/test/libcxx/transitive_includes/expected.streambuf
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string
copy from libcxx/test/libcxx/transitive_includes/expected.string
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
copy from libcxx/test/libcxx/transitive_includes/expected.string_view
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.string_view
diff --git a/libcxx/test/libcxx/transitive_includes/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
copy from libcxx/test/libcxx/transitive_includes/expected.strstream
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.strstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
copy from libcxx/test/libcxx/transitive_includes/expected.system_error
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.system_error
diff --git a/libcxx/test/libcxx/transitive_includes/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
copy from libcxx/test/libcxx/transitive_includes/expected.thread
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.thread
diff --git a/libcxx/test/libcxx/transitive_includes/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
copy from libcxx/test/libcxx/transitive_includes/expected.tuple
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.tuple
diff --git a/libcxx/test/libcxx/transitive_includes/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
copy from libcxx/test/libcxx/transitive_includes/expected.type_traits
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
copy from libcxx/test/libcxx/transitive_includes/expected.typeindex
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.typeindex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
copy from libcxx/test/libcxx/transitive_includes/expected.typeinfo
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
copy from libcxx/test/libcxx/transitive_includes/expected.unordered_map
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
copy from libcxx/test/libcxx/transitive_includes/expected.unordered_set
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
copy from libcxx/test/libcxx/transitive_includes/expected.utility
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
copy from libcxx/test/libcxx/transitive_includes/expected.valarray
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.valarray
diff --git a/libcxx/test/libcxx/transitive_includes/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
copy from libcxx/test/libcxx/transitive_includes/expected.variant
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.variant
diff --git a/libcxx/test/libcxx/transitive_includes/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
copy from libcxx/test/libcxx/transitive_includes/expected.vector
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.version b/libcxx/test/libcxx/transitive_includes/cxx17/expected.version
copy from libcxx/test/libcxx/transitive_includes/expected.version
copy to libcxx/test/libcxx/transitive_includes/cxx17/expected.version
diff --git a/libcxx/test/libcxx/transitive_includes/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
copy from libcxx/test/libcxx/transitive_includes/expected.algorithm
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.any b/libcxx/test/libcxx/transitive_includes/cxx20/expected.any
copy from libcxx/test/libcxx/transitive_includes/expected.any
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.any
diff --git a/libcxx/test/libcxx/transitive_includes/expected.array b/libcxx/test/libcxx/transitive_includes/cxx20/expected.array
copy from libcxx/test/libcxx/transitive_includes/expected.array
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.array
diff --git a/libcxx/test/libcxx/transitive_includes/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
copy from libcxx/test/libcxx/transitive_includes/expected.atomic
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.atomic
diff --git a/libcxx/test/libcxx/transitive_includes/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
copy from libcxx/test/libcxx/transitive_includes/expected.barrier
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.barrier
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
copy from libcxx/test/libcxx/transitive_includes/expected.bit
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.bit
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
copy from libcxx/test/libcxx/transitive_includes/expected.bitset
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.bitset
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
copy from libcxx/test/libcxx/transitive_includes/expected.cassert
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cassert
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
copy from libcxx/test/libcxx/transitive_includes/expected.ccomplex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ccomplex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
copy from libcxx/test/libcxx/transitive_includes/expected.cctype
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
copy from libcxx/test/libcxx/transitive_includes/expected.cerrno
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cerrno
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
copy from libcxx/test/libcxx/transitive_includes/expected.cfenv
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cfenv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
copy from libcxx/test/libcxx/transitive_includes/expected.cfloat
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cfloat
diff --git a/libcxx/test/libcxx/transitive_includes/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
copy from libcxx/test/libcxx/transitive_includes/expected.charconv
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.charconv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
copy from libcxx/test/libcxx/transitive_includes/expected.chrono
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.chrono
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
copy from libcxx/test/libcxx/transitive_includes/expected.cinttypes
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cinttypes
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
copy from libcxx/test/libcxx/transitive_includes/expected.ciso646
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ciso646
diff --git a/libcxx/test/libcxx/transitive_includes/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
copy from libcxx/test/libcxx/transitive_includes/expected.climits
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.climits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
copy from libcxx/test/libcxx/transitive_includes/expected.clocale
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.clocale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
copy from libcxx/test/libcxx/transitive_includes/expected.cmath
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
copy from libcxx/test/libcxx/transitive_includes/expected.codecvt
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.codecvt
diff --git a/libcxx/test/libcxx/transitive_includes/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
copy from libcxx/test/libcxx/transitive_includes/expected.compare
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.compare
diff --git a/libcxx/test/libcxx/transitive_includes/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
copy from libcxx/test/libcxx/transitive_includes/expected.complex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.complex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
copy from libcxx/test/libcxx/transitive_includes/expected.concepts
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.concepts
diff --git a/libcxx/test/libcxx/transitive_includes/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
copy from libcxx/test/libcxx/transitive_includes/expected.condition_variable
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.condition_variable
diff --git a/libcxx/test/libcxx/transitive_includes/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
copy from libcxx/test/libcxx/transitive_includes/expected.coroutine
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
copy from libcxx/test/libcxx/transitive_includes/expected.csetjmp
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.csetjmp
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
copy from libcxx/test/libcxx/transitive_includes/expected.csignal
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.csignal
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
copy from libcxx/test/libcxx/transitive_includes/expected.cstdarg
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdarg
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
copy from libcxx/test/libcxx/transitive_includes/expected.cstdbool
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdbool
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
copy from libcxx/test/libcxx/transitive_includes/expected.cstddef
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
copy from libcxx/test/libcxx/transitive_includes/expected.cstdint
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
copy from libcxx/test/libcxx/transitive_includes/expected.cstdio
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
copy from libcxx/test/libcxx/transitive_includes/expected.cstdlib
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
copy from libcxx/test/libcxx/transitive_includes/expected.cstring
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cstring
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
copy from libcxx/test/libcxx/transitive_includes/expected.ctgmath
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ctgmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
copy from libcxx/test/libcxx/transitive_includes/expected.ctime
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ctime
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
copy from libcxx/test/libcxx/transitive_includes/expected.cuchar
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cuchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
copy from libcxx/test/libcxx/transitive_includes/expected.cwchar
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cwchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
copy from libcxx/test/libcxx/transitive_includes/expected.cwctype
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
copy from libcxx/test/libcxx/transitive_includes/expected.deque
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
copy from libcxx/test/libcxx/transitive_includes/expected.exception
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.exception
diff --git a/libcxx/test/libcxx/transitive_includes/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
copy from libcxx/test/libcxx/transitive_includes/expected.execution
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.execution
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_deque
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_functional
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_iterator
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_list
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_map
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_memory_resource
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_propagate_const
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_regex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_set
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_simd
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_simd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_string
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_utility
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
copy from libcxx/test/libcxx/transitive_includes/expected.experimental_vector
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.experimental_vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
copy from libcxx/test/libcxx/transitive_includes/expected.ext_hash_map
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
copy from libcxx/test/libcxx/transitive_includes/expected.ext_hash_set
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ext_hash_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
copy from libcxx/test/libcxx/transitive_includes/expected.filesystem
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.filesystem
diff --git a/libcxx/test/libcxx/transitive_includes/expected.format b/libcxx/test/libcxx/transitive_includes/cxx20/expected.format
copy from libcxx/test/libcxx/transitive_includes/expected.format
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.format
diff --git a/libcxx/test/libcxx/transitive_includes/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
copy from libcxx/test/libcxx/transitive_includes/expected.forward_list
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
copy from libcxx/test/libcxx/transitive_includes/expected.fstream
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.fstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
copy from libcxx/test/libcxx/transitive_includes/expected.functional
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.future b/libcxx/test/libcxx/transitive_includes/cxx20/expected.future
copy from libcxx/test/libcxx/transitive_includes/expected.future
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.future
diff --git a/libcxx/test/libcxx/transitive_includes/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
copy from libcxx/test/libcxx/transitive_includes/expected.initializer_list
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
copy from libcxx/test/libcxx/transitive_includes/expected.iomanip
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
copy from libcxx/test/libcxx/transitive_includes/expected.ios
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ios
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
copy from libcxx/test/libcxx/transitive_includes/expected.iosfwd
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
copy from libcxx/test/libcxx/transitive_includes/expected.iostream
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.iostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
copy from libcxx/test/libcxx/transitive_includes/expected.istream
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.istream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
copy from libcxx/test/libcxx/transitive_includes/expected.iterator
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
copy from libcxx/test/libcxx/transitive_includes/expected.latch
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.latch
diff --git a/libcxx/test/libcxx/transitive_includes/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
copy from libcxx/test/libcxx/transitive_includes/expected.limits
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.limits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.list b/libcxx/test/libcxx/transitive_includes/cxx20/expected.list
copy from libcxx/test/libcxx/transitive_includes/expected.list
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
copy from libcxx/test/libcxx/transitive_includes/expected.locale
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.locale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.map
copy from libcxx/test/libcxx/transitive_includes/expected.map
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
copy from libcxx/test/libcxx/transitive_includes/expected.memory
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.memory
diff --git a/libcxx/test/libcxx/transitive_includes/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
copy from libcxx/test/libcxx/transitive_includes/expected.mutex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.new b/libcxx/test/libcxx/transitive_includes/cxx20/expected.new
copy from libcxx/test/libcxx/transitive_includes/expected.new
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.new
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
copy from libcxx/test/libcxx/transitive_includes/expected.numbers
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.numbers
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
copy from libcxx/test/libcxx/transitive_includes/expected.numeric
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.numeric
diff --git a/libcxx/test/libcxx/transitive_includes/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
copy from libcxx/test/libcxx/transitive_includes/expected.optional
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.optional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
copy from libcxx/test/libcxx/transitive_includes/expected.ostream
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
copy from libcxx/test/libcxx/transitive_includes/expected.queue
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.queue
diff --git a/libcxx/test/libcxx/transitive_includes/expected.random b/libcxx/test/libcxx/transitive_includes/cxx20/expected.random
copy from libcxx/test/libcxx/transitive_includes/expected.random
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.random
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
copy from libcxx/test/libcxx/transitive_includes/expected.ranges
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ranges
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
copy from libcxx/test/libcxx/transitive_includes/expected.ratio
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.ratio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
copy from libcxx/test/libcxx/transitive_includes/expected.regex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
copy from libcxx/test/libcxx/transitive_includes/expected.scoped_allocator
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.scoped_allocator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
copy from libcxx/test/libcxx/transitive_includes/expected.semaphore
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.semaphore
diff --git a/libcxx/test/libcxx/transitive_includes/expected.set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.set
copy from libcxx/test/libcxx/transitive_includes/expected.set
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
copy from libcxx/test/libcxx/transitive_includes/expected.shared_mutex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.shared_mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.span b/libcxx/test/libcxx/transitive_includes/cxx20/expected.span
copy from libcxx/test/libcxx/transitive_includes/expected.span
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.span
diff --git a/libcxx/test/libcxx/transitive_includes/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
copy from libcxx/test/libcxx/transitive_includes/expected.sstream
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.sstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
copy from libcxx/test/libcxx/transitive_includes/expected.stack
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.stack
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
copy from libcxx/test/libcxx/transitive_includes/expected.stdexcept
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
copy from libcxx/test/libcxx/transitive_includes/expected.streambuf
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string
copy from libcxx/test/libcxx/transitive_includes/expected.string
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
copy from libcxx/test/libcxx/transitive_includes/expected.string_view
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.string_view
diff --git a/libcxx/test/libcxx/transitive_includes/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
copy from libcxx/test/libcxx/transitive_includes/expected.strstream
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.strstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
copy from libcxx/test/libcxx/transitive_includes/expected.system_error
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.system_error
diff --git a/libcxx/test/libcxx/transitive_includes/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
copy from libcxx/test/libcxx/transitive_includes/expected.thread
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.thread
diff --git a/libcxx/test/libcxx/transitive_includes/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
copy from libcxx/test/libcxx/transitive_includes/expected.tuple
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.tuple
diff --git a/libcxx/test/libcxx/transitive_includes/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
copy from libcxx/test/libcxx/transitive_includes/expected.type_traits
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
copy from libcxx/test/libcxx/transitive_includes/expected.typeindex
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.typeindex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
copy from libcxx/test/libcxx/transitive_includes/expected.typeinfo
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
copy from libcxx/test/libcxx/transitive_includes/expected.unordered_map
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
copy from libcxx/test/libcxx/transitive_includes/expected.unordered_set
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
copy from libcxx/test/libcxx/transitive_includes/expected.utility
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
copy from libcxx/test/libcxx/transitive_includes/expected.valarray
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.valarray
diff --git a/libcxx/test/libcxx/transitive_includes/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
copy from libcxx/test/libcxx/transitive_includes/expected.variant
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.variant
diff --git a/libcxx/test/libcxx/transitive_includes/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
copy from libcxx/test/libcxx/transitive_includes/expected.vector
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.version b/libcxx/test/libcxx/transitive_includes/cxx20/expected.version
copy from libcxx/test/libcxx/transitive_includes/expected.version
copy to libcxx/test/libcxx/transitive_includes/cxx20/expected.version
diff --git a/libcxx/test/libcxx/transitive_includes/expected.algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
rename from libcxx/test/libcxx/transitive_includes/expected.algorithm
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.any b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
rename from libcxx/test/libcxx/transitive_includes/expected.any
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.any
diff --git a/libcxx/test/libcxx/transitive_includes/expected.array b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
rename from libcxx/test/libcxx/transitive_includes/expected.array
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.array
diff --git a/libcxx/test/libcxx/transitive_includes/expected.atomic b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
rename from libcxx/test/libcxx/transitive_includes/expected.atomic
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.atomic
diff --git a/libcxx/test/libcxx/transitive_includes/expected.barrier b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
rename from libcxx/test/libcxx/transitive_includes/expected.barrier
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.barrier
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bit b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
rename from libcxx/test/libcxx/transitive_includes/expected.bit
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.bit
diff --git a/libcxx/test/libcxx/transitive_includes/expected.bitset b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
rename from libcxx/test/libcxx/transitive_includes/expected.bitset
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.bitset
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cassert b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
rename from libcxx/test/libcxx/transitive_includes/expected.cassert
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cassert
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ccomplex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
rename from libcxx/test/libcxx/transitive_includes/expected.ccomplex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ccomplex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
rename from libcxx/test/libcxx/transitive_includes/expected.cctype
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cerrno b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
rename from libcxx/test/libcxx/transitive_includes/expected.cerrno
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cerrno
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfenv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
rename from libcxx/test/libcxx/transitive_includes/expected.cfenv
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfenv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cfloat b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
rename from libcxx/test/libcxx/transitive_includes/expected.cfloat
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cfloat
diff --git a/libcxx/test/libcxx/transitive_includes/expected.charconv b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
rename from libcxx/test/libcxx/transitive_includes/expected.charconv
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.charconv
diff --git a/libcxx/test/libcxx/transitive_includes/expected.chrono b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
rename from libcxx/test/libcxx/transitive_includes/expected.chrono
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.chrono
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cinttypes b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
rename from libcxx/test/libcxx/transitive_includes/expected.cinttypes
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cinttypes
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ciso646 b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
rename from libcxx/test/libcxx/transitive_includes/expected.ciso646
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ciso646
diff --git a/libcxx/test/libcxx/transitive_includes/expected.climits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
rename from libcxx/test/libcxx/transitive_includes/expected.climits
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.climits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.clocale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
rename from libcxx/test/libcxx/transitive_includes/expected.clocale
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.clocale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
rename from libcxx/test/libcxx/transitive_includes/expected.cmath
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.codecvt b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
rename from libcxx/test/libcxx/transitive_includes/expected.codecvt
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.codecvt
diff --git a/libcxx/test/libcxx/transitive_includes/expected.compare b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
rename from libcxx/test/libcxx/transitive_includes/expected.compare
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.compare
diff --git a/libcxx/test/libcxx/transitive_includes/expected.complex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
rename from libcxx/test/libcxx/transitive_includes/expected.complex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.complex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.concepts b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
rename from libcxx/test/libcxx/transitive_includes/expected.concepts
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.concepts
diff --git a/libcxx/test/libcxx/transitive_includes/expected.condition_variable b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
rename from libcxx/test/libcxx/transitive_includes/expected.condition_variable
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.condition_variable
diff --git a/libcxx/test/libcxx/transitive_includes/expected.coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
rename from libcxx/test/libcxx/transitive_includes/expected.coroutine
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csetjmp b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
rename from libcxx/test/libcxx/transitive_includes/expected.csetjmp
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.csetjmp
diff --git a/libcxx/test/libcxx/transitive_includes/expected.csignal b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
rename from libcxx/test/libcxx/transitive_includes/expected.csignal
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.csignal
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdarg b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
rename from libcxx/test/libcxx/transitive_includes/expected.cstdarg
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdarg
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdbool b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
rename from libcxx/test/libcxx/transitive_includes/expected.cstdbool
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdbool
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstddef b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
rename from libcxx/test/libcxx/transitive_includes/expected.cstddef
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstddef
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdint b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
rename from libcxx/test/libcxx/transitive_includes/expected.cstdint
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdint
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
rename from libcxx/test/libcxx/transitive_includes/expected.cstdio
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstdlib b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
rename from libcxx/test/libcxx/transitive_includes/expected.cstdlib
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstdlib
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cstring b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
rename from libcxx/test/libcxx/transitive_includes/expected.cstring
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cstring
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctgmath b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
rename from libcxx/test/libcxx/transitive_includes/expected.ctgmath
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctgmath
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ctime b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
rename from libcxx/test/libcxx/transitive_includes/expected.ctime
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ctime
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cuchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
rename from libcxx/test/libcxx/transitive_includes/expected.cuchar
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cuchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwchar b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
rename from libcxx/test/libcxx/transitive_includes/expected.cwchar
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwchar
diff --git a/libcxx/test/libcxx/transitive_includes/expected.cwctype b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
rename from libcxx/test/libcxx/transitive_includes/expected.cwctype
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.cwctype
diff --git a/libcxx/test/libcxx/transitive_includes/expected.deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
rename from libcxx/test/libcxx/transitive_includes/expected.deque
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.exception b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
rename from libcxx/test/libcxx/transitive_includes/expected.exception
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.exception
diff --git a/libcxx/test/libcxx/transitive_includes/expected.execution b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
rename from libcxx/test/libcxx/transitive_includes/expected.execution
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.execution
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_algorithm
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_algorithm
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_coroutine
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_coroutine
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_deque b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_deque
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_deque
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_forward_list
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_functional
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_iterator
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_list
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_map
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_memory_resource
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_memory_resource
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_propagate_const
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_propagate_const
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_regex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_set
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_simd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_simd
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_simd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_string
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_type_traits
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_map
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_unordered_set
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_utility
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.experimental_vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
rename from libcxx/test/libcxx/transitive_includes/expected.experimental_vector
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.experimental_vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
rename from libcxx/test/libcxx/transitive_includes/expected.ext_hash_map
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ext_hash_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
rename from libcxx/test/libcxx/transitive_includes/expected.ext_hash_set
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ext_hash_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.filesystem b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
rename from libcxx/test/libcxx/transitive_includes/expected.filesystem
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.filesystem
diff --git a/libcxx/test/libcxx/transitive_includes/expected.format b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
rename from libcxx/test/libcxx/transitive_includes/expected.format
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.format
diff --git a/libcxx/test/libcxx/transitive_includes/expected.forward_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
rename from libcxx/test/libcxx/transitive_includes/expected.forward_list
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.forward_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.fstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
rename from libcxx/test/libcxx/transitive_includes/expected.fstream
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.fstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.functional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
rename from libcxx/test/libcxx/transitive_includes/expected.functional
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.functional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.future b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
rename from libcxx/test/libcxx/transitive_includes/expected.future
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.future
diff --git a/libcxx/test/libcxx/transitive_includes/expected.initializer_list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
rename from libcxx/test/libcxx/transitive_includes/expected.initializer_list
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.initializer_list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iomanip b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
rename from libcxx/test/libcxx/transitive_includes/expected.iomanip
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.iomanip
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ios b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
rename from libcxx/test/libcxx/transitive_includes/expected.ios
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ios
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iosfwd b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
rename from libcxx/test/libcxx/transitive_includes/expected.iosfwd
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.iosfwd
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
rename from libcxx/test/libcxx/transitive_includes/expected.iostream
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.iostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.istream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
rename from libcxx/test/libcxx/transitive_includes/expected.istream
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.istream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.iterator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
rename from libcxx/test/libcxx/transitive_includes/expected.iterator
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.iterator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.latch b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
rename from libcxx/test/libcxx/transitive_includes/expected.latch
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.latch
diff --git a/libcxx/test/libcxx/transitive_includes/expected.limits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
rename from libcxx/test/libcxx/transitive_includes/expected.limits
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.limits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.list b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
rename from libcxx/test/libcxx/transitive_includes/expected.list
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.list
diff --git a/libcxx/test/libcxx/transitive_includes/expected.locale b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
rename from libcxx/test/libcxx/transitive_includes/expected.locale
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.locale
diff --git a/libcxx/test/libcxx/transitive_includes/expected.map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
rename from libcxx/test/libcxx/transitive_includes/expected.map
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.memory b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
rename from libcxx/test/libcxx/transitive_includes/expected.memory
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.memory
diff --git a/libcxx/test/libcxx/transitive_includes/expected.mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
rename from libcxx/test/libcxx/transitive_includes/expected.mutex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.new b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
rename from libcxx/test/libcxx/transitive_includes/expected.new
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.new
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numbers b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
rename from libcxx/test/libcxx/transitive_includes/expected.numbers
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.numbers
diff --git a/libcxx/test/libcxx/transitive_includes/expected.numeric b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
rename from libcxx/test/libcxx/transitive_includes/expected.numeric
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.numeric
diff --git a/libcxx/test/libcxx/transitive_includes/expected.optional b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
rename from libcxx/test/libcxx/transitive_includes/expected.optional
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.optional
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ostream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
rename from libcxx/test/libcxx/transitive_includes/expected.ostream
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ostream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.queue b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
rename from libcxx/test/libcxx/transitive_includes/expected.queue
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.queue
diff --git a/libcxx/test/libcxx/transitive_includes/expected.random b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
rename from libcxx/test/libcxx/transitive_includes/expected.random
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.random
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ranges b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
rename from libcxx/test/libcxx/transitive_includes/expected.ranges
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ranges
diff --git a/libcxx/test/libcxx/transitive_includes/expected.ratio b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
rename from libcxx/test/libcxx/transitive_includes/expected.ratio
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.ratio
diff --git a/libcxx/test/libcxx/transitive_includes/expected.regex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
rename from libcxx/test/libcxx/transitive_includes/expected.regex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.regex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.scoped_allocator b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
rename from libcxx/test/libcxx/transitive_includes/expected.scoped_allocator
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.scoped_allocator
diff --git a/libcxx/test/libcxx/transitive_includes/expected.semaphore b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
rename from libcxx/test/libcxx/transitive_includes/expected.semaphore
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.semaphore
diff --git a/libcxx/test/libcxx/transitive_includes/expected.set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
rename from libcxx/test/libcxx/transitive_includes/expected.set
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.shared_mutex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
rename from libcxx/test/libcxx/transitive_includes/expected.shared_mutex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.shared_mutex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.span b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
rename from libcxx/test/libcxx/transitive_includes/expected.span
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.span
diff --git a/libcxx/test/libcxx/transitive_includes/expected.sstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
rename from libcxx/test/libcxx/transitive_includes/expected.sstream
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.sstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stack b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
rename from libcxx/test/libcxx/transitive_includes/expected.stack
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.stack
diff --git a/libcxx/test/libcxx/transitive_includes/expected.stdexcept b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
rename from libcxx/test/libcxx/transitive_includes/expected.stdexcept
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.stdexcept
diff --git a/libcxx/test/libcxx/transitive_includes/expected.streambuf b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
rename from libcxx/test/libcxx/transitive_includes/expected.streambuf
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.streambuf
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
rename from libcxx/test/libcxx/transitive_includes/expected.string
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.string
diff --git a/libcxx/test/libcxx/transitive_includes/expected.string_view b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
rename from libcxx/test/libcxx/transitive_includes/expected.string_view
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.string_view
diff --git a/libcxx/test/libcxx/transitive_includes/expected.strstream b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
rename from libcxx/test/libcxx/transitive_includes/expected.strstream
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.strstream
diff --git a/libcxx/test/libcxx/transitive_includes/expected.system_error b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
rename from libcxx/test/libcxx/transitive_includes/expected.system_error
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.system_error
diff --git a/libcxx/test/libcxx/transitive_includes/expected.thread b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
rename from libcxx/test/libcxx/transitive_includes/expected.thread
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.thread
diff --git a/libcxx/test/libcxx/transitive_includes/expected.tuple b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
rename from libcxx/test/libcxx/transitive_includes/expected.tuple
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.tuple
diff --git a/libcxx/test/libcxx/transitive_includes/expected.type_traits b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
rename from libcxx/test/libcxx/transitive_includes/expected.type_traits
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.type_traits
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeindex b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
rename from libcxx/test/libcxx/transitive_includes/expected.typeindex
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeindex
diff --git a/libcxx/test/libcxx/transitive_includes/expected.typeinfo b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
rename from libcxx/test/libcxx/transitive_includes/expected.typeinfo
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.typeinfo
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_map b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
rename from libcxx/test/libcxx/transitive_includes/expected.unordered_map
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_map
diff --git a/libcxx/test/libcxx/transitive_includes/expected.unordered_set b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
rename from libcxx/test/libcxx/transitive_includes/expected.unordered_set
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.unordered_set
diff --git a/libcxx/test/libcxx/transitive_includes/expected.utility b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
rename from libcxx/test/libcxx/transitive_includes/expected.utility
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.utility
diff --git a/libcxx/test/libcxx/transitive_includes/expected.valarray b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
rename from libcxx/test/libcxx/transitive_includes/expected.valarray
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.valarray
diff --git a/libcxx/test/libcxx/transitive_includes/expected.variant b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
rename from libcxx/test/libcxx/transitive_includes/expected.variant
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.variant
diff --git a/libcxx/test/libcxx/transitive_includes/expected.vector b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
rename from libcxx/test/libcxx/transitive_includes/expected.vector
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.vector
diff --git a/libcxx/test/libcxx/transitive_includes/expected.version b/libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
rename from libcxx/test/libcxx/transitive_includes/expected.version
rename to libcxx/test/libcxx/transitive_includes/cxx2b/expected.version
diff --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -81,6 +81,7 @@
             default=lambda cfg: next(s for s in reversed(_allStandards) if getStdFlag(cfg, s)),
             actions=lambda std: [
               AddFeature(std),
+              AddSubstitution('%{cxx_std}', re.sub('\+','x', std)),
               AddCompileFlag(lambda cfg: getStdFlag(cfg, std)),
             ]),