Skip to content

Commit 2f05f44

Browse files
committed
fix: path
1 parent 4b79e8d commit 2f05f44

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
cmake_minimum_required(VERSION 3.11)
1+
cmake_minimum_required(VERSION 3.9)
22
set(CMAKE_CXX_STANDARD 11)
33
project(aws-lambda-runtime
44
VERSION 0.0.0
55
LANGUAGES CXX)
66

77
option(ENABLE_LTO "Enables link-time optimization, requires compiler support." OFF)
8-
option(ENABLE_TESTS "Enables building all tests." OFF)
9-
option(ENABLE_INTEGRATION_TESTS "Enables building integration tests, requires AWS C++ SDK." OFF)
8+
option(ENABLE_TESTS "Enables building integration tests, requires AWS C++ SDK." OFF)
109
option(ENABLE_SANITIZERS "Enables ASan and UBSan." OFF)
1110

1211
add_library(${PROJECT_NAME}
@@ -91,18 +90,12 @@ else ()
9190
target_compile_definitions(${PROJECT_NAME} PRIVATE "AWS_LAMBDA_LOG=0")
9291
endif()
9392

94-
9593
#tests
9694
if (ENABLE_TESTS)
9795
enable_testing()
9896
add_subdirectory(tests)
99-
elseif (ENABLE_INTEGRATION_TESTS)
100-
enable_testing()
101-
add_subdirectory(tests)
10297
endif()
10398

104-
105-
10699
#versioning
107100
configure_file(
108101
"${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp.in"

ci/codebuild/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cd build
99
cmake .. -GNinja \
1010
-DBUILD_SHARED_LIBS=ON \
1111
-DCMAKE_BUILD_TYPE=Debug \
12-
-DENABLE_INTEGRATION_TESTS=ON \
12+
-DENABLE_TESTS=ON \
1313
-DCMAKE_INSTALL_PREFIX=/install $@
1414
ninja
1515
ninja install

tests/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ if(DEFINED ENV{GITHUB_ACTIONS})
1414
set(INSTALL_GTEST OFF)
1515
FetchContent_MakeAvailable(gtest)
1616

17-
# Unit tests executable
1817
add_executable(unit_tests
1918
unit/no_op_test.cpp)
2019
target_link_libraries(unit_tests PRIVATE gtest_main aws-lambda-runtime)
2120

22-
# Register unit tests with CTest
21+
# Register unit tests
2322
include(GoogleTest)
2423
gtest_discover_tests(unit_tests
2524
PROPERTIES
@@ -42,7 +41,7 @@ if(AWSSDK_FOUND)
4241
target_link_libraries(${PROJECT_NAME} PRIVATE ${AWSSDK_LINK_LIBRARIES} aws-lambda-runtime)
4342

4443
include(GoogleTest)
45-
gtest_discover_tests(${PROJECT_NAME} EXTRA_ARGS "--aws_prefix=${TEST_RESOURCE_PREFIX}") # requires CMake 3.10 or later
44+
gtest_discover_tests(${PROJECT_NAME} EXTRA_ARGS "--aws_prefix=${TEST_RESOURCE_PREFIX}")
4645

4746
add_subdirectory(resources)
4847
else()

0 commit comments

Comments
 (0)