llvm
diff --git a/‎libcxx/CMakeLists.txt
Lines changed: 0 additions & 4 deletions b/‎libcxx/CMakeLists.txt
Lines changed: 0 additions & 4 deletions
diff --git a/‎libcxx/docs/TestingLibcxx.rst
Lines changed: 5 additions & 5 deletions b/‎libcxx/docs/TestingLibcxx.rst
Lines changed: 5 additions & 5 deletions
diff --git a/‎libcxx/test/CMakeLists.txt
Lines changed: 4 additions & 0 deletions b/‎libcxx/test/CMakeLists.txt
Lines changed: 4 additions & 0 deletions
diff --git a/‎libcxx/benchmarks/CMakeLists.txt renamed to ‎libcxx/test/benchmarks/CMakeLists.txt
Lines changed: 4 additions & 2 deletions b/‎libcxx/benchmarks/CMakeLists.txt renamed to ‎libcxx/test/benchmarks/CMakeLists.txt
Lines changed: 4 additions & 2 deletions
diff --git a/‎libcxx/benchmarks/CartesianBenchmarks.h renamed to ‎libcxx/test/benchmarks/CartesianBenchmarks.h b/‎libcxx/benchmarks/CartesianBenchmarks.h renamed to ‎libcxx/test/benchmarks/CartesianBenchmarks.h
diff --git a/‎libcxx/benchmarks/ContainerBenchmarks.h renamed to ‎libcxx/test/benchmarks/ContainerBenchmarks.h b/‎libcxx/benchmarks/ContainerBenchmarks.h renamed to ‎libcxx/test/benchmarks/ContainerBenchmarks.h
diff --git a/‎libcxx/benchmarks/GenerateInput.h renamed to ‎libcxx/test/benchmarks/GenerateInput.h b/‎libcxx/benchmarks/GenerateInput.h renamed to ‎libcxx/test/benchmarks/GenerateInput.h
diff --git a/‎libcxx/benchmarks/Utilities.h renamed to ‎libcxx/test/benchmarks/Utilities.h b/‎libcxx/benchmarks/Utilities.h renamed to ‎libcxx/test/benchmarks/Utilities.h
diff --git a/‎libcxx/benchmarks/VariantBenchmarks.h renamed to ‎libcxx/test/benchmarks/VariantBenchmarks.h b/‎libcxx/benchmarks/VariantBenchmarks.h renamed to ‎libcxx/test/benchmarks/VariantBenchmarks.h
diff --git a/‎libcxx/benchmarks/algorithms.partition_point.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms.partition_point.bench.cpp b/‎libcxx/benchmarks/algorithms.partition_point.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms.partition_point.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/common.h renamed to ‎libcxx/test/benchmarks/algorithms/common.h b/‎libcxx/benchmarks/algorithms/common.h renamed to ‎libcxx/test/benchmarks/algorithms/common.h
diff --git a/‎libcxx/benchmarks/algorithms/count.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/count.bench.cpp b/‎libcxx/benchmarks/algorithms/count.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/count.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/equal.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/equal.bench.cpp b/‎libcxx/benchmarks/algorithms/equal.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/equal.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/fill.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/fill.bench.cpp b/‎libcxx/benchmarks/algorithms/fill.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/fill.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/find.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/find.bench.cpp b/‎libcxx/benchmarks/algorithms/find.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/find.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/for_each.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/for_each.bench.cpp b/‎libcxx/benchmarks/algorithms/for_each.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/for_each.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/lower_bound.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/lower_bound.bench.cpp b/‎libcxx/benchmarks/algorithms/lower_bound.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/lower_bound.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/make_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/make_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/make_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/make_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/make_heap_then_sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/make_heap_then_sort_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/make_heap_then_sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/make_heap_then_sort_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/min.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/min.bench.cpp b/‎libcxx/benchmarks/algorithms/min.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/min.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/min_max_element.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/min_max_element.bench.cpp b/‎libcxx/benchmarks/algorithms/min_max_element.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/min_max_element.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/minmax.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/minmax.bench.cpp b/‎libcxx/benchmarks/algorithms/minmax.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/minmax.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/mismatch.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/mismatch.bench.cpp b/‎libcxx/benchmarks/algorithms/mismatch.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/mismatch.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/pop_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/pop_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/pop_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/pop_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/pstl.stable_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/pstl.stable_sort.bench.cpp b/‎libcxx/benchmarks/algorithms/pstl.stable_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/pstl.stable_sort.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/push_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/push_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/push_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/push_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_contains.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_contains.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_contains.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_contains.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_ends_with.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_ends_with.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_ends_with.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_ends_with.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_make_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_make_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_make_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_make_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_make_heap_then_sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_make_heap_then_sort_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_make_heap_then_sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_make_heap_then_sort_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_pop_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_pop_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_pop_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_pop_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_push_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_push_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_push_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_push_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_sort.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_sort.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_sort_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_sort_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/ranges_stable_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_stable_sort.bench.cpp b/‎libcxx/benchmarks/algorithms/ranges_stable_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/ranges_stable_sort.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/set_intersection.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/set_intersection.bench.cpp b/‎libcxx/benchmarks/algorithms/set_intersection.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/set_intersection.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/sort.bench.cpp b/‎libcxx/benchmarks/algorithms/sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/sort.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/sort_heap.bench.cpp b/‎libcxx/benchmarks/algorithms/sort_heap.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/sort_heap.bench.cpp
diff --git a/‎libcxx/benchmarks/algorithms/stable_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/stable_sort.bench.cpp b/‎libcxx/benchmarks/algorithms/stable_sort.bench.cpp renamed to ‎libcxx/test/benchmarks/algorithms/stable_sort.bench.cpp
diff --git a/‎libcxx/benchmarks/allocation.bench.cpp renamed to ‎libcxx/test/benchmarks/allocation.bench.cpp b/‎libcxx/benchmarks/allocation.bench.cpp renamed to ‎libcxx/test/benchmarks/allocation.bench.cpp
diff --git a/‎libcxx/benchmarks/atomic_wait.bench.cpp renamed to ‎libcxx/test/benchmarks/atomic_wait.bench.cpp b/‎libcxx/benchmarks/atomic_wait.bench.cpp renamed to ‎libcxx/test/benchmarks/atomic_wait.bench.cpp
diff --git a/‎libcxx/benchmarks/atomic_wait_vs_mutex_lock.bench.cpp renamed to ‎libcxx/test/benchmarks/atomic_wait_vs_mutex_lock.bench.cpp b/‎libcxx/benchmarks/atomic_wait_vs_mutex_lock.bench.cpp renamed to ‎libcxx/test/benchmarks/atomic_wait_vs_mutex_lock.bench.cpp
diff --git a/‎libcxx/benchmarks/deque.bench.cpp renamed to ‎libcxx/test/benchmarks/deque.bench.cpp b/‎libcxx/benchmarks/deque.bench.cpp renamed to ‎libcxx/test/benchmarks/deque.bench.cpp
diff --git a/‎libcxx/benchmarks/deque_iterator.bench.cpp renamed to ‎libcxx/test/benchmarks/deque_iterator.bench.cpp b/‎libcxx/benchmarks/deque_iterator.bench.cpp renamed to ‎libcxx/test/benchmarks/deque_iterator.bench.cpp
diff --git a/‎libcxx/benchmarks/exception_ptr.bench.cpp renamed to ‎libcxx/test/benchmarks/exception_ptr.bench.cpp b/‎libcxx/benchmarks/exception_ptr.bench.cpp renamed to ‎libcxx/test/benchmarks/exception_ptr.bench.cpp
diff --git a/‎libcxx/benchmarks/filesystem.bench.cpp renamed to ‎libcxx/test/benchmarks/filesystem.bench.cpp b/‎libcxx/benchmarks/filesystem.bench.cpp renamed to ‎libcxx/test/benchmarks/filesystem.bench.cpp
diff --git a/‎libcxx/benchmarks/format.bench.cpp renamed to ‎libcxx/test/benchmarks/format.bench.cpp b/‎libcxx/benchmarks/format.bench.cpp renamed to ‎libcxx/test/benchmarks/format.bench.cpp
diff --git a/‎libcxx/benchmarks/format_to.bench.cpp renamed to ‎libcxx/test/benchmarks/format_to.bench.cpp b/‎libcxx/benchmarks/format_to.bench.cpp renamed to ‎libcxx/test/benchmarks/format_to.bench.cpp
diff --git a/‎libcxx/benchmarks/format_to_n.bench.cpp renamed to ‎libcxx/test/benchmarks/format_to_n.bench.cpp b/‎libcxx/benchmarks/format_to_n.bench.cpp renamed to ‎libcxx/test/benchmarks/format_to_n.bench.cpp
diff --git a/‎libcxx/benchmarks/formatted_size.bench.cpp renamed to ‎libcxx/test/benchmarks/formatted_size.bench.cpp b/‎libcxx/benchmarks/formatted_size.bench.cpp renamed to ‎libcxx/test/benchmarks/formatted_size.bench.cpp
diff --git a/‎libcxx/benchmarks/formatter_float.bench.cpp renamed to ‎libcxx/test/benchmarks/formatter_float.bench.cpp b/‎libcxx/benchmarks/formatter_float.bench.cpp renamed to ‎libcxx/test/benchmarks/formatter_float.bench.cpp
diff --git a/‎libcxx/benchmarks/formatter_int.bench.cpp renamed to ‎libcxx/test/benchmarks/formatter_int.bench.cpp b/‎libcxx/benchmarks/formatter_int.bench.cpp renamed to ‎libcxx/test/benchmarks/formatter_int.bench.cpp
diff --git a/‎libcxx/benchmarks/function.bench.cpp renamed to ‎libcxx/test/benchmarks/function.bench.cpp b/‎libcxx/benchmarks/function.bench.cpp renamed to ‎libcxx/test/benchmarks/function.bench.cpp
diff --git a/‎libcxx/benchmarks/join_view.bench.cpp renamed to ‎libcxx/test/benchmarks/join_view.bench.cpp b/‎libcxx/benchmarks/join_view.bench.cpp renamed to ‎libcxx/test/benchmarks/join_view.bench.cpp
diff --git a/‎libcxx/benchmarks/lexicographical_compare_three_way.bench.cpp renamed to ‎libcxx/test/benchmarks/lexicographical_compare_three_way.bench.cpp b/‎libcxx/benchmarks/lexicographical_compare_three_way.bench.cpp renamed to ‎libcxx/test/benchmarks/lexicographical_compare_three_way.bench.cpp
diff --git a/‎libcxx/benchmarks/libcxxabi/dynamic_cast.bench.cpp renamed to ‎libcxx/test/benchmarks/libcxxabi/dynamic_cast.bench.cpp b/‎libcxx/benchmarks/libcxxabi/dynamic_cast.bench.cpp renamed to ‎libcxx/test/benchmarks/libcxxabi/dynamic_cast.bench.cpp
diff --git a/‎libcxx/benchmarks/libcxxabi/dynamic_cast_old_stress.bench.cpp renamed to ‎libcxx/test/benchmarks/libcxxabi/dynamic_cast_old_stress.bench.cpp b/‎libcxx/benchmarks/libcxxabi/dynamic_cast_old_stress.bench.cpp renamed to ‎libcxx/test/benchmarks/libcxxabi/dynamic_cast_old_stress.bench.cpp
diff --git a/‎libcxx/benchmarks/lit.cfg.py renamed to ‎libcxx/test/benchmarks/lit.cfg.py.in
Lines changed: 3 additions & 3 deletions b/‎libcxx/benchmarks/lit.cfg.py renamed to ‎libcxx/test/benchmarks/lit.cfg.py.in
Lines changed: 3 additions & 3 deletions
diff --git a/‎libcxx/benchmarks/lit.site.cfg.py.in renamed to ‎libcxx/test/benchmarks/lit.site.cfg.py.in
Lines changed: 1 addition & 1 deletion b/‎libcxx/benchmarks/lit.site.cfg.py.in renamed to ‎libcxx/test/benchmarks/lit.site.cfg.py.in
Lines changed: 1 addition & 1 deletion
diff --git a/‎libcxx/benchmarks/map.bench.cpp renamed to ‎libcxx/test/benchmarks/map.bench.cpp b/‎libcxx/benchmarks/map.bench.cpp renamed to ‎libcxx/test/benchmarks/map.bench.cpp
diff --git a/‎libcxx/benchmarks/monotonic_buffer.bench.cpp renamed to ‎libcxx/test/benchmarks/monotonic_buffer.bench.cpp b/‎libcxx/benchmarks/monotonic_buffer.bench.cpp renamed to ‎libcxx/test/benchmarks/monotonic_buffer.bench.cpp
diff --git a/‎libcxx/benchmarks/numeric/gcd.bench.cpp renamed to ‎libcxx/test/benchmarks/numeric/gcd.bench.cpp b/‎libcxx/benchmarks/numeric/gcd.bench.cpp renamed to ‎libcxx/test/benchmarks/numeric/gcd.bench.cpp
diff --git a/‎libcxx/benchmarks/ordered_set.bench.cpp renamed to ‎libcxx/test/benchmarks/ordered_set.bench.cpp b/‎libcxx/benchmarks/ordered_set.bench.cpp renamed to ‎libcxx/test/benchmarks/ordered_set.bench.cpp
diff --git a/‎libcxx/benchmarks/random.bench.cpp renamed to ‎libcxx/test/benchmarks/random.bench.cpp b/‎libcxx/benchmarks/random.bench.cpp renamed to ‎libcxx/test/benchmarks/random.bench.cpp
diff --git a/‎libcxx/benchmarks/shared_mutex_vs_mutex.bench.cpp renamed to ‎libcxx/test/benchmarks/shared_mutex_vs_mutex.bench.cpp b/‎libcxx/benchmarks/shared_mutex_vs_mutex.bench.cpp renamed to ‎libcxx/test/benchmarks/shared_mutex_vs_mutex.bench.cpp
diff --git a/‎libcxx/benchmarks/std_format_spec_string_unicode.bench.cpp renamed to ‎libcxx/test/benchmarks/std_format_spec_string_unicode.bench.cpp b/‎libcxx/benchmarks/std_format_spec_string_unicode.bench.cpp renamed to ‎libcxx/test/benchmarks/std_format_spec_string_unicode.bench.cpp
diff --git a/‎libcxx/benchmarks/std_format_spec_string_unicode_escape.bench.cpp renamed to ‎libcxx/test/benchmarks/std_format_spec_string_unicode_escape.bench.cpp b/‎libcxx/benchmarks/std_format_spec_string_unicode_escape.bench.cpp renamed to ‎libcxx/test/benchmarks/std_format_spec_string_unicode_escape.bench.cpp
diff --git a/‎libcxx/benchmarks/stop_token.bench.cpp renamed to ‎libcxx/test/benchmarks/stop_token.bench.cpp b/‎libcxx/benchmarks/stop_token.bench.cpp renamed to ‎libcxx/test/benchmarks/stop_token.bench.cpp
diff --git a/‎libcxx/benchmarks/string.bench.cpp renamed to ‎libcxx/test/benchmarks/string.bench.cpp b/‎libcxx/benchmarks/string.bench.cpp renamed to ‎libcxx/test/benchmarks/string.bench.cpp
diff --git a/‎libcxx/benchmarks/stringstream.bench.cpp renamed to ‎libcxx/test/benchmarks/stringstream.bench.cpp b/‎libcxx/benchmarks/stringstream.bench.cpp renamed to ‎libcxx/test/benchmarks/stringstream.bench.cpp
diff --git a/‎libcxx/benchmarks/system_error.bench.cpp renamed to ‎libcxx/test/benchmarks/system_error.bench.cpp b/‎libcxx/benchmarks/system_error.bench.cpp renamed to ‎libcxx/test/benchmarks/system_error.bench.cpp
diff --git a/‎libcxx/benchmarks/to_chars.bench.cpp renamed to ‎libcxx/test/benchmarks/to_chars.bench.cpp b/‎libcxx/benchmarks/to_chars.bench.cpp renamed to ‎libcxx/test/benchmarks/to_chars.bench.cpp
diff --git a/‎libcxx/benchmarks/unordered_set_operations.bench.cpp renamed to ‎libcxx/test/benchmarks/unordered_set_operations.bench.cpp b/‎libcxx/benchmarks/unordered_set_operations.bench.cpp renamed to ‎libcxx/test/benchmarks/unordered_set_operations.bench.cpp
diff --git a/‎libcxx/benchmarks/util_smartptr.bench.cpp renamed to ‎libcxx/test/benchmarks/util_smartptr.bench.cpp b/‎libcxx/benchmarks/util_smartptr.bench.cpp renamed to ‎libcxx/test/benchmarks/util_smartptr.bench.cpp
diff --git a/‎libcxx/benchmarks/variant_visit_1.bench.cpp renamed to ‎libcxx/test/benchmarks/variant_visit_1.bench.cpp b/‎libcxx/benchmarks/variant_visit_1.bench.cpp renamed to ‎libcxx/test/benchmarks/variant_visit_1.bench.cpp
diff --git a/‎libcxx/benchmarks/variant_visit_2.bench.cpp renamed to ‎libcxx/test/benchmarks/variant_visit_2.bench.cpp b/‎libcxx/benchmarks/variant_visit_2.bench.cpp renamed to ‎libcxx/test/benchmarks/variant_visit_2.bench.cpp
diff --git a/‎libcxx/benchmarks/variant_visit_3.bench.cpp renamed to ‎libcxx/test/benchmarks/variant_visit_3.bench.cpp b/‎libcxx/benchmarks/variant_visit_3.bench.cpp renamed to ‎libcxx/test/benchmarks/variant_visit_3.bench.cpp
diff --git a/‎libcxx/benchmarks/vector_operations.bench.cpp renamed to ‎libcxx/test/benchmarks/vector_operations.bench.cpp b/‎libcxx/benchmarks/vector_operations.bench.cpp renamed to ‎libcxx/test/benchmarks/vector_operations.bench.cpp
@@ -845,10 +845,6 @@ add_subdirectory(src)
 add_subdirectory(utils)
 add_subdirectory(modules)
 
-if (LIBCXX_INCLUDE_BENCHMARKS)
-  add_subdirectory(benchmarks)
-endif()
-
 if (LIBCXX_INCLUDE_TESTS)
   add_subdirectory(test)
   add_subdirectory(lib/abi)
 
@@ -1,6 +1,10 @@
 include(HandleLitArguments)
 add_subdirectory(tools)
 
+if (LIBCXX_INCLUDE_BENCHMARKS)
+  add_subdirectory(benchmarks)
+endif()
+
 set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
 set(SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n")
 
 
@@ -5,8 +5,6 @@ include(CheckCXXCompilerFlag)
 # Build Google Benchmark
 #==============================================================================
 
-set(CMAKE_FOLDER "${CMAKE_FOLDER}/Benchmarks")
-
 set(BENCHMARK_COMPILE_FLAGS
     -Wno-unused-command-line-argument
     -nostdinc++
@@ -191,6 +189,10 @@ endforeach()
 if (LIBCXX_INCLUDE_TESTS)
   include(AddLLVM)
 
+  configure_lit_site_cfg(
+          ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py.in
+          ${CMAKE_CURRENT_BINARY_DIR}/lit.cfg.py)
+
   configure_lit_site_cfg(
           ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
           ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
 
@@ -3,7 +3,7 @@
 import os
 import site
 
-site.addsitedir(os.path.join(os.path.dirname(os.path.dirname(__file__)), "utils"))
+site.addsitedir(os.path.join("@LIBCXX_SOURCE_DIR@", "utils"))
 from libcxx.test.googlebenchmark import GoogleBenchmark
 
 # Tell pylint that we know config and lit_config exist somewhere.
@@ -15,8 +15,8 @@
 config.name = "libc++ benchmarks"
 config.suffixes = []
 
-config.test_exec_root = os.path.join(config.libcxx_obj_root, "benchmarks")
-config.test_source_root = config.test_exec_root
+config.test_exec_root = "@CMAKE_CURRENT_BINARY_DIR@"
+config.test_source_root = "@CMAKE_CURRENT_BINARY_DIR@"
 
 config.test_format = GoogleBenchmark(
     test_sub_dirs=".", test_suffix=".bench.out", benchmark_args=config.benchmark_args
 
@@ -7,4 +7,4 @@ config.libcxx_obj_root = "@LIBCXX_BINARY_DIR@"
 config.benchmark_args = "@LIBCXX_BENCHMARK_TEST_ARGS@".split(';')
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@LIBCXX_SOURCE_DIR@/benchmarks/lit.cfg.py")
+lit_config.load_config(config, "@CMAKE_CURRENT_BINARY_DIR@/lit.cfg.py")