diff --git a/libcxx/test/benchmarks/algorithms.partition_point.bench.cpp b/libcxx/test/benchmarks/algorithms/algorithms.partition_point.bench.cpp similarity index 98% rename from libcxx/test/benchmarks/algorithms.partition_point.bench.cpp rename to libcxx/test/benchmarks/algorithms/algorithms.partition_point.bench.cpp index 42ebce8ad2f4a..0777acbafb5cc 100644 --- a/libcxx/test/benchmarks/algorithms.partition_point.bench.cpp +++ b/libcxx/test/benchmarks/algorithms/algorithms.partition_point.bench.cpp @@ -17,8 +17,8 @@ #include "benchmark/benchmark.h" -#include "CartesianBenchmarks.h" -#include "GenerateInput.h" +#include "../CartesianBenchmarks.h" +#include "../GenerateInput.h" namespace { diff --git a/libcxx/test/benchmarks/lexicographical_compare_three_way.bench.cpp b/libcxx/test/benchmarks/algorithms/lexicographical_compare_three_way.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/lexicographical_compare_three_way.bench.cpp rename to libcxx/test/benchmarks/algorithms/lexicographical_compare_three_way.bench.cpp diff --git a/libcxx/test/benchmarks/ContainerBenchmarks.h b/libcxx/test/benchmarks/containers/ContainerBenchmarks.h similarity index 99% rename from libcxx/test/benchmarks/ContainerBenchmarks.h rename to libcxx/test/benchmarks/containers/ContainerBenchmarks.h index 458134c8191d1..6d21e12896ec9 100644 --- a/libcxx/test/benchmarks/ContainerBenchmarks.h +++ b/libcxx/test/benchmarks/containers/ContainerBenchmarks.h @@ -15,7 +15,7 @@ #include #include "benchmark/benchmark.h" -#include "Utilities.h" +#include "../Utilities.h" #include "test_iterators.h" namespace ContainerBenchmarks { diff --git a/libcxx/test/benchmarks/deque.bench.cpp b/libcxx/test/benchmarks/containers/deque.bench.cpp similarity index 98% rename from libcxx/test/benchmarks/deque.bench.cpp rename to libcxx/test/benchmarks/containers/deque.bench.cpp index ab0ba96b12ffc..7ff1093a9391c 100644 --- a/libcxx/test/benchmarks/deque.bench.cpp +++ b/libcxx/test/benchmarks/containers/deque.bench.cpp @@ -14,7 +14,7 @@ #include "benchmark/benchmark.h" #include "ContainerBenchmarks.h" -#include "GenerateInput.h" +#include "../GenerateInput.h" using namespace ContainerBenchmarks; diff --git a/libcxx/test/benchmarks/deque_iterator.bench.cpp b/libcxx/test/benchmarks/containers/deque_iterator.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/deque_iterator.bench.cpp rename to libcxx/test/benchmarks/containers/deque_iterator.bench.cpp diff --git a/libcxx/test/benchmarks/map.bench.cpp b/libcxx/test/benchmarks/containers/map.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/map.bench.cpp rename to libcxx/test/benchmarks/containers/map.bench.cpp index 81bdc5077f026..e37c7d8d55163 100644 --- a/libcxx/test/benchmarks/map.bench.cpp +++ b/libcxx/test/benchmarks/containers/map.bench.cpp @@ -14,7 +14,7 @@ #include #include -#include "CartesianBenchmarks.h" +#include "../CartesianBenchmarks.h" #include "benchmark/benchmark.h" #include "test_macros.h" diff --git a/libcxx/test/benchmarks/ordered_set.bench.cpp b/libcxx/test/benchmarks/containers/ordered_set.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/ordered_set.bench.cpp rename to libcxx/test/benchmarks/containers/ordered_set.bench.cpp index 7883233c23aee..cb68902c6dcc8 100644 --- a/libcxx/test/benchmarks/ordered_set.bench.cpp +++ b/libcxx/test/benchmarks/containers/ordered_set.bench.cpp @@ -17,7 +17,7 @@ #include #include -#include "CartesianBenchmarks.h" +#include "../CartesianBenchmarks.h" #include "benchmark/benchmark.h" #include "test_macros.h" diff --git a/libcxx/test/benchmarks/string.bench.cpp b/libcxx/test/benchmarks/containers/string.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/string.bench.cpp rename to libcxx/test/benchmarks/containers/string.bench.cpp index 0d7ce2b87bead..f7da3e2da312b 100644 --- a/libcxx/test/benchmarks/string.bench.cpp +++ b/libcxx/test/benchmarks/containers/string.bench.cpp @@ -13,8 +13,8 @@ #include #include -#include "CartesianBenchmarks.h" -#include "GenerateInput.h" +#include "../CartesianBenchmarks.h" +#include "../GenerateInput.h" #include "benchmark/benchmark.h" #include "test_macros.h" diff --git a/libcxx/test/benchmarks/unordered_set_operations.bench.cpp b/libcxx/test/benchmarks/containers/unordered_set_operations.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/unordered_set_operations.bench.cpp rename to libcxx/test/benchmarks/containers/unordered_set_operations.bench.cpp index 7b1700bfd850d..a8448ef5a0cfb 100644 --- a/libcxx/test/benchmarks/unordered_set_operations.bench.cpp +++ b/libcxx/test/benchmarks/containers/unordered_set_operations.bench.cpp @@ -18,7 +18,7 @@ #include "benchmark/benchmark.h" #include "ContainerBenchmarks.h" -#include "GenerateInput.h" +#include "../GenerateInput.h" #include "test_macros.h" using namespace ContainerBenchmarks; diff --git a/libcxx/test/benchmarks/vector_operations.bench.cpp b/libcxx/test/benchmarks/containers/vector_operations.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/vector_operations.bench.cpp rename to libcxx/test/benchmarks/containers/vector_operations.bench.cpp index 3a72eaec4dd57..9449bed31ec38 100644 --- a/libcxx/test/benchmarks/vector_operations.bench.cpp +++ b/libcxx/test/benchmarks/containers/vector_operations.bench.cpp @@ -19,7 +19,7 @@ #include "benchmark/benchmark.h" #include "ContainerBenchmarks.h" -#include "GenerateInput.h" +#include "../GenerateInput.h" using namespace ContainerBenchmarks; diff --git a/libcxx/test/benchmarks/format.bench.cpp b/libcxx/test/benchmarks/format/format.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/format.bench.cpp rename to libcxx/test/benchmarks/format/format.bench.cpp diff --git a/libcxx/test/benchmarks/format_to.bench.cpp b/libcxx/test/benchmarks/format/format_to.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/format_to.bench.cpp rename to libcxx/test/benchmarks/format/format_to.bench.cpp diff --git a/libcxx/test/benchmarks/format_to_n.bench.cpp b/libcxx/test/benchmarks/format/format_to_n.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/format_to_n.bench.cpp rename to libcxx/test/benchmarks/format/format_to_n.bench.cpp diff --git a/libcxx/test/benchmarks/formatted_size.bench.cpp b/libcxx/test/benchmarks/format/formatted_size.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/formatted_size.bench.cpp rename to libcxx/test/benchmarks/format/formatted_size.bench.cpp diff --git a/libcxx/test/benchmarks/formatter_float.bench.cpp b/libcxx/test/benchmarks/format/formatter_float.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/formatter_float.bench.cpp rename to libcxx/test/benchmarks/format/formatter_float.bench.cpp index ec20eab3c0937..77c067e7bc03e 100644 --- a/libcxx/test/benchmarks/formatter_float.bench.cpp +++ b/libcxx/test/benchmarks/format/formatter_float.bench.cpp @@ -17,7 +17,7 @@ #include #include -#include "CartesianBenchmarks.h" +#include "../CartesianBenchmarks.h" #include "benchmark/benchmark.h" // *** Localization *** diff --git a/libcxx/test/benchmarks/formatter_int.bench.cpp b/libcxx/test/benchmarks/format/formatter_int.bench.cpp similarity index 99% rename from libcxx/test/benchmarks/formatter_int.bench.cpp rename to libcxx/test/benchmarks/format/formatter_int.bench.cpp index db0edab6ae052..6df0187667aa1 100644 --- a/libcxx/test/benchmarks/formatter_int.bench.cpp +++ b/libcxx/test/benchmarks/format/formatter_int.bench.cpp @@ -12,7 +12,7 @@ #include #include -#include "CartesianBenchmarks.h" +#include "../CartesianBenchmarks.h" #include "benchmark/benchmark.h" #include "test_macros.h" diff --git a/libcxx/test/benchmarks/std_format_spec_string_unicode.bench.cpp b/libcxx/test/benchmarks/format/std_format_spec_string_unicode.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/std_format_spec_string_unicode.bench.cpp rename to libcxx/test/benchmarks/format/std_format_spec_string_unicode.bench.cpp diff --git a/libcxx/test/benchmarks/std_format_spec_string_unicode_escape.bench.cpp b/libcxx/test/benchmarks/format/std_format_spec_string_unicode_escape.bench.cpp similarity index 100% rename from libcxx/test/benchmarks/std_format_spec_string_unicode_escape.bench.cpp rename to libcxx/test/benchmarks/format/std_format_spec_string_unicode_escape.bench.cpp