Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/boringssl.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2016-09-24 02:43:17 +0300
committerCQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>2016-09-27 01:13:03 +0300
commitd5c72c8bc8ee9f591e4baaa57be67d60e2b6ed0b (patch)
tree2aaebdf1dcccf3c1f32fc1dd71cbbc7e486ca0e5
parent7358fab6454101cace227fcc21e79caa03622fef (diff)
Fix run_tests target.
The COMMANDs will “not necessarily composed into a stateful shell or batch script” so the change directory needs to be linked with the command that needs it. This fixes “make run_tests”. Change-Id: I364530fe1331aba7fa9899616916f610981c2c95 Reviewed-on: https://boringssl-review.googlesource.com/11263 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7438caf6..a0c6998a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,9 +214,9 @@ add_custom_target(
run_tests
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${CMAKE_BINARY_DIR}
- COMMAND cd ssl/test/runner
- COMMAND ${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
- ${RUNNER_ARGS}
+ COMMAND cd ssl/test/runner &&
+ ${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
+ ${RUNNER_ARGS}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
DEPENDS all_tests bssl_shim
${MAYBE_USES_TERMINAL})