Make ninja run_tests output less confusing
We say "all tests passed" but we actually mean only the unit tests. Now
the output is:
Running Go tests
ok boringssl.googlesource.com/boringssl/ssl/test/runner/hpke (cached)
ok boringssl.googlesource.com/boringssl/util/ar (cached)
ok boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/testmodulewrapper (cached)
ok boringssl.googlesource.com/boringssl/util/fipstools/delocate (cached)
Running unit tests
ssl_test [shard 1/10]
...
pki_test [shard 8/10]
All unit tests passed!
Running SSL tests
0/0/5481/5481/5481
PASS
ok boringssl.googlesource.com/boringssl/ssl/test/runner 21.110s
all_tests.go really should be called unit_tests.go, but renaming it will
probably be too annoying.
Change-Id: I7ff6684221930e19152ab3400419f4e5209aaf46
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/67107
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 685b7b4..0af8052 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -627,9 +627,14 @@
add_custom_target(
run_tests
+ COMMAND ${CMAKE_COMMAND} -E echo "Running Go tests"
COMMAND ${GO_EXECUTABLE} test ${GO_TESTS}
+ COMMAND ${CMAKE_COMMAND} -E echo
+ COMMAND ${CMAKE_COMMAND} -E echo "Running unit tests"
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E echo
+ COMMAND ${CMAKE_COMMAND} -E echo "Running SSL tests"
COMMAND cd ssl/test/runner &&
${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
${HANDSHAKER_ARGS} ${RUNNER_ARGS}
diff --git a/util/all_tests.go b/util/all_tests.go
index b2f0b17..dad4d4a 100644
--- a/util/all_tests.go
+++ b/util/all_tests.go
@@ -431,5 +431,5 @@
os.Exit(1)
}
- fmt.Printf("\nAll tests passed!\n")
+ fmt.Printf("All unit tests passed!\n")
}