diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2022-09-20 00:47:34 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2022-09-20 08:55:44 -0400 |
| commit | 2473014ab26cb63fc44543ae670609277fa94edf (patch) | |
| tree | 422ce07dcebf07fcf61b2b54065c1cc9df9efb96 /jjb/scripts/vpp/gcc-build.sh | |
| parent | 7ddc627fbd166538f82017b1158bad922154a499 (diff) | |
Run VPP 'make test' on Ubuntu 22.04 for master.
- clean up build parameters
Change-Id: I1c620f89eb59916620ae9e36dacf9368fb38e476
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/scripts/vpp/gcc-build.sh')
| -rw-r--r-- | jjb/scripts/vpp/gcc-build.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/jjb/scripts/vpp/gcc-build.sh b/jjb/scripts/vpp/gcc-build.sh index 5afe739db..48877457b 100644 --- a/jjb/scripts/vpp/gcc-build.sh +++ b/jjb/scripts/vpp/gcc-build.sh @@ -47,16 +47,24 @@ make_build_release_build_test_gcov_sanity() { BUILD_ERROR="FAILED 'make build'" return fi + if [ -n "${MAKE_PARALLEL_JOBS}" ] ; then + TEST_JOBS="${MAKE_PARALLEL_JOBS}" + echo "Testing VPP with ${TEST_JOBS} cores." + else + TEST_JOBS="auto" + echo "Testing VPP with automatically calculated number of cores. " \ + "See test logs for the exact number." + fi # TODO: Add 'smoke test' env var to select smoke test cases # then update this accordingly. For now pick a few basic suites... MAKE_TEST_SUITES="vlib vppinfra vpe_api vapi cli bihash" for suite in $MAKE_TEST_SUITES ; do - if ! make UNATTENDED=yes GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test ; then - BUILD_ERROR="FAILED 'make GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test'!" + if ! make UNATTENDED=yes TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test ; then + BUILD_ERROR="FAILED 'make TESTS_GCOV=1 TEST_JOBS=$TEST_JOBS TEST=$suite test'!" return fi - if ! make UNATTENDED=yes GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test-debug ; then - BUILD_ERROR="FAILED 'make GCOV_TESTS=1 TEST_JOBS=auto TEST=$suite test-debug'!" + if ! make UNATTENDED=yes TESTS_GCOV=1 TEST_JOBS="$TEST_JOBS" TEST=$suite test-debug ; then + BUILD_ERROR="FAILED 'make TESTS_GCOV=1 TEST_JOBS=$TEST_JOBS TEST=$suite test-debug'!" return fi done |