Skip to content

Commit 5d92946

Browse files
committed
aliged testing and benchmark target names
1 parent 14b8020 commit 5d92946

4 files changed

Lines changed: 14 additions & 11 deletions

File tree

.github/workflows/benchmarks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040

4141
- name: Execute the smoke test
4242
run: |
43-
./build_bench/benchmarks/gl_benchmarks \
43+
./build_bench/benchmarks/cpp-gl-bench \
4444
--benchmark_repetitions=1 --benchmark_display_aggregates_only=true \
4545
--bip-v 100

benchmarks/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(gl_benchmarks LANGUAGES CXX)
2+
project(cpp-gl-bench LANGUAGES CXX)
33

44
include(FetchContent)
55

@@ -30,13 +30,13 @@ FetchContent_Declare(
3030
FetchContent_MakeAvailable(cpp-argon)
3131

3232
# Define the benchmarks target
33-
add_executable(gl_benchmarks
33+
add_executable(cpp-gl-bench
3434
source/main.cpp
3535
source/runner.cpp
3636
suites/is_bipartite.cpp
3737
)
3838

39-
target_compile_options(gl_benchmarks PRIVATE
39+
target_compile_options(cpp-gl-bench PRIVATE
4040
-Werror
4141
-Wall
4242
-Wextra
@@ -50,21 +50,21 @@ target_compile_options(gl_benchmarks PRIVATE
5050
-O${BENCH_OPT_MODE}
5151
)
5252

53-
target_include_directories(gl_benchmarks PRIVATE include)
54-
target_link_libraries(gl_benchmarks PRIVATE
53+
target_include_directories(cpp-gl-bench PRIVATE include)
54+
target_link_libraries(cpp-gl-bench PRIVATE
5555
benchmark::benchmark
5656
cpp-argon
5757
cpp-gl
5858
)
5959

6060
if(BENCH_GL_DEFS)
6161
separate_arguments(BENCH_GL_DEFS_LIST NATIVE_COMMAND "${BENCH_GL_DEFS}")
62-
target_compile_definitions(gl_benchmarks PRIVATE ${BENCH_GL_DEFS_LIST})
62+
target_compile_definitions(cpp-gl-bench PRIVATE ${BENCH_GL_DEFS_LIST})
6363
endif()
6464

6565
# Include Boost Graph Library
6666
if(BENCH_INCLUDE_BGL)
6767
find_package(Boost CONFIG REQUIRED)
68-
target_link_libraries(gl_benchmarks PRIVATE Boost::headers)
69-
target_compile_definitions(gl_benchmarks PRIVATE GL_BENCH_INCLUDE_BGL)
68+
target_link_libraries(cpp-gl-bench PRIVATE Boost::headers)
69+
target_compile_definitions(cpp-gl-bench PRIVATE GL_BENCH_INCLUDE_BGL)
7070
endif()

benchmarks/source/runner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace vw = std::views;
1010

1111
namespace gl_bench {
1212

13-
runner::runner() : _parser("gl_benchmarks") {
13+
runner::runner() : _parser("cpp-gl-bench") {
1414
auto& glob_args = this->_parser.add_group("Global Benchmark Options");
1515
this->_glob_args = &glob_args;
1616

tests/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ set(INCLUDE_DIRS "include" "external")
77
set(EXECUTABLE_DIR "${CMAKE_CURRENT_BINARY_DIR}")
88

99
# Test target generation
10-
function(add_test_target TARGET_NAME SOURCE_DIRS DATA_DIR TESTING_DEF)
10+
function(add_test_target BASE_NAME SOURCE_DIRS DATA_DIR TESTING_DEF)
11+
set(TARGET_NAME "cpp-gl-tests-${BASE_NAME}")
12+
1113
set(TARGET_SOURCES "")
1214
foreach(SOURCE_DIR ${SOURCE_DIRS})
1315
file(GLOB_RECURSE CURRENT_SOURCES "${SOURCE_DIR}/*.cpp")
@@ -17,6 +19,7 @@ function(add_test_target TARGET_NAME SOURCE_DIRS DATA_DIR TESTING_DEF)
1719
add_executable(${TARGET_NAME} ${TARGET_SOURCES})
1820

1921
set_target_properties(${TARGET_NAME} PROPERTIES
22+
OUTPUT_NAME "${BASE_NAME}"
2023
RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_DIR}"
2124
CXX_STANDARD ${CMAKE_CXX_STANDARD}
2225
CXX_STANDARD_REQUIRED YES

0 commit comments

Comments
 (0)