Skip to content

Commit f53ca9f

Browse files
davidbenBoringssl LUCI CQ
authored andcommitted
Run Go tests as part of run_tests
This doesn't run them as part of CI yet, but I'll follow-up with a recipe change to read the same util/go_tests.txt file and run Go tests in there. Bug: 506 Change-Id: Ifd527b1d00ec30896582360132249230fab7e7c0 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57645 Commit-Queue: David Benjamin <[email protected]> Reviewed-by: Adam Langley <[email protected]>
1 parent b3c2c75 commit f53ca9f

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,13 +572,21 @@ else()
572572
add_custom_target(fips_specific_tests_if_any)
573573
endif()
574574

575+
# Read util/go_tests.txt into a CMake variable.
576+
file(READ util/go_tests.txt GO_TESTS)
577+
string(REPLACE "\n" ";" GO_TESTS "${GO_TESTS}")
578+
list(REMOVE_ITEM GO_TESTS "")
579+
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
580+
util/go_tests.txt)
581+
575582
add_custom_target(
576583
run_tests
577584
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
578585
${CMAKE_BINARY_DIR}
579586
COMMAND cd ssl/test/runner &&
580587
${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
581588
${HANDSHAKER_ARGS} ${RUNNER_ARGS}
589+
COMMAND ${GO_EXECUTABLE} test ${GO_TESTS}
582590
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
583591
DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
584592
USES_TERMINAL)

util/go_tests.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
./ssl/test/runner/hpke
2+
./util/ar
3+
./util/fipstools/acvp/acvptool/testmodulewrapper
4+
./util/fipstools/delocate

0 commit comments

Comments
 (0)