Skip to content

Commit 37fc6e2

Browse files
ldionnecopybara-github
authored andcommitted
[libc++] Move the benchmarks under libcxx/test (#99371)
This is an intermediate and fairly mechanical step towards unifying the benchmarks with the rest of the test suite. Moving this around requires a few changes, notably making sure we don't throw a wrench into the discovery process of the normal test suite. This won't be a problem anymore once benchmarks are taken into account by the test setup out of the box. NOKEYCHECK=True GitOrigin-RevId: 78b4b5cccbd92363708906d9171e21b0307b91a2
1 parent 99ace22 commit 37fc6e2

File tree

78 files changed

+17
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+17
-15
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -845,10 +845,6 @@ add_subdirectory(src)
845845
add_subdirectory(utils)
846846
add_subdirectory(modules)
847847

848-
if (LIBCXX_INCLUDE_BENCHMARKS)
849-
add_subdirectory(benchmarks)
850-
endif()
851-
852848
if (LIBCXX_INCLUDE_TESTS)
853849
add_subdirectory(test)
854850
add_subdirectory(lib/abi)

docs/TestingLibcxx.rst

Lines changed: 5 additions & 5 deletions

test/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
include(HandleLitArguments)
22
add_subdirectory(tools)
33

4+
if (LIBCXX_INCLUDE_BENCHMARKS)
5+
add_subdirectory(benchmarks)
6+
endif()
7+
48
set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
59
set(SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n")
610

benchmarks/CMakeLists.txt renamed to test/benchmarks/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ include(CheckCXXCompilerFlag)
55
# Build Google Benchmark
66
#==============================================================================
77

8-
set(CMAKE_FOLDER "${CMAKE_FOLDER}/Benchmarks")
9-
108
set(BENCHMARK_COMPILE_FLAGS
119
-Wno-unused-command-line-argument
1210
-nostdinc++
@@ -191,6 +189,10 @@ endforeach()
191189
if (LIBCXX_INCLUDE_TESTS)
192190
include(AddLLVM)
193191

192+
configure_lit_site_cfg(
193+
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py.in
194+
${CMAKE_CURRENT_BINARY_DIR}/lit.cfg.py)
195+
194196
configure_lit_site_cfg(
195197
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
196198
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)