aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2023-02-27 16:36:24 -0500
committerBoringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-02-27 21:53:43 +0000
commite3a5face899e16183f1d207d7327baac57454935 (patch)
tree4f157b3cbe13836dd142ec672db397154ae383ab /CMakeLists.txt
parent3c6085b6ae982a80633bf5369c274036702c6848 (diff)
downloadboringssl-e3a5face899e16183f1d207d7327baac57454935.zip
boringssl-e3a5face899e16183f1d207d7327baac57454935.tar.gz
boringssl-e3a5face899e16183f1d207d7327baac57454935.tar.bz2
Fix ninja run_tests
https://boringssl-review.googlesource.com/c/boringssl/+/57645 wasn't quite right. The cd to run ssl/test/runner affects the subsequent commands. Fix this by running the Go tests first. They're very fast compared to the others anyway. Change-Id: Id5ea54a9787173eb3ed80e9db2c9ecfe064a93b0 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57688 Auto-Submit: David Benjamin <davidben@google.com> Commit-Queue: Bob Beck <bbe@google.com> Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Bob Beck <bbe@google.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23154a2..a1fb153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,12 +581,12 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
add_custom_target(
run_tests
+ COMMAND ${GO_EXECUTABLE} test ${GO_TESTS}
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${CMAKE_CURRENT_BINARY_DIR}
COMMAND cd ssl/test/runner &&
${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
${HANDSHAKER_ARGS} ${RUNNER_ARGS}
- COMMAND ${GO_EXECUTABLE} test ${GO_TESTS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
USES_TERMINAL)