commit 17dc94e87466ac8928096c4f45954989d585cfe5
author David Benjamin <davidben@google.com> Fri Aug 10 09:05:20 2018 -0500
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Aug 10 14:31:47 2018 +0000
tree df6990cb4246ed9c0d224051379a59d6c12183e3
parent 678c841cbe0a8980148d97913c25c730744261d8

Add -handshaker-path to run_test.

Otherwise ninja run_tests doesn't work right build directories named something
other than "build" on Linux.

Change-Id: I4d7ff319aed338870f5ac071e875fda549bbbd06
Reviewed-on: https://boringssl-review.googlesource.com/30824
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Steven Valdez <svaldez@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d067e1..82ead7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -464,13 +464,17 @@
   set(MAYBE_USES_TERMINAL USES_TERMINAL)
 endif()
 
+if(UNIX AND NOT APPLE AND NOT ANDROID)
+  set(HANDSHAKER_ARGS "-handshaker-path" $<TARGET_FILE:handshaker>)
+endif()
+
 add_custom_target(
     run_tests
     COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
             ${CMAKE_BINARY_DIR}
     COMMAND cd ssl/test/runner &&
             ${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
-              ${RUNNER_ARGS}
+              ${HANDSHAKER_ARGS} ${RUNNER_ARGS}
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS all_tests bssl_shim handshaker
     ${MAYBE_USES_TERMINAL})