diff options
| author | Arnstein Ressem <aressem@vespa.ai> | 2024-06-04 13:31:56 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@vespa.ai> | 2024-06-04 13:31:56 +0200 |
| commit | 18200a82d71a281467536389cf0a0983a6ff33f5 (patch) | |
| tree | 608f04b3a0d13d2696879dfcb417502670b900b2 | |
| parent | 796b5d09315c70a75300312227acf0c8acb3f6a9 (diff) | |
Dont run install and cpp-test together.
| -rw-r--r-- | .buildkite/Makefile | 2 | ||||
| -rwxr-xr-x | .buildkite/cpp-test.sh | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.buildkite/Makefile b/.buildkite/Makefile index 9510fae43fd..b039b73ba53 100644 --- a/.buildkite/Makefile +++ b/.buildkite/Makefile @@ -53,7 +53,7 @@ cpp: bootstrap-cmake cpp-test: cpp @$(TOP)/execute.sh $@ -install: cpp java +install: cpp java cpp-test @$(TOP)/execute.sh $@ build-rpms: install diff --git a/.buildkite/cpp-test.sh b/.buildkite/cpp-test.sh index 9a9b8eac8bb..6033cb8d47e 100755 --- a/.buildkite/cpp-test.sh +++ b/.buildkite/cpp-test.sh @@ -3,9 +3,5 @@ set -euo pipefail set +e -#if ! ctest3 --output-junit "$LOG_DIR/vespa-cpptest-results.xml" --output-on-failure -j "$NUM_CPP_THREADS" ; then -if ! ctest3 --output-junit "$LOG_DIR/vespa-cpptest-results.xml" --verbose -j 12 ; then - #sleep 3600 - exit 1 -fi +ctest3 --output-junit "$LOG_DIR/vespa-cpptest-results.xml" --output-on-failure -j "$NUM_CPU_LIMIT" |