File tree Expand file tree Collapse file tree 2 files changed +17
-5
lines changed
Expand file tree Collapse file tree 2 files changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -686,6 +686,8 @@ cmd_test() {
686686 do_build=1
687687 do_archive=1
688688 do_kvm_check=1
689+ do_build_dir_check=1
690+ do_ci_artifacts_check=1
689691 # Parse any command line args.
690692 while [ $# -gt 0 ]; do
691693 case " $1 " in
@@ -713,6 +715,12 @@ cmd_test() {
713715 " --no-kvm-check" )
714716 do_kvm_check=0
715717 ;;
718+ " --no-build-dir-check" )
719+ do_build_dir_check=0
720+ ;;
721+ " --no-ci-artifacts-check" )
722+ do_ci_artifacts_check=0
723+ ;;
716724 " --" ) { shift ; break ; } ;;
717725 * )
718726 die " Unknown argument: $1 . Please use --help for help."
@@ -724,8 +732,8 @@ cmd_test() {
724732 # Check prerequisites.
725733 [ $do_kvm_check != 0 ] && ensure_kvm
726734 ensure_devctr
727- ensure_build_dir
728- ensure_ci_artifacts
735+ [ $do_build_dir_check != 0 ] && ensure_build_dir
736+ [ $do_ci_artifacts_check != 0 ] && ensure_ci_artifacts
729737 if [ $do_build != 0 ]; then
730738 cmd_build --release
731739 if [ -n " $BUILDKITE_PULL_REQUEST_BASE_BRANCH " ]; then
@@ -958,8 +966,8 @@ cmd_checkstyle() {
958966 cmd_sh " git-secrets --register-aws && git-secrets --scan"
959967 fi
960968
961- cmd_test --no-build --no-kvm-check -- -n 4 --dist worksteal integration_tests/style || exit 1
962- cmd_test --no-build --no-kvm-check -- -n 4 --doctest-modules framework || exit 1
969+ cmd_test --no-build --no-kvm-check --no-build-dir-check --no-ci-artifacts-check -- -n 4 --dist worksteal integration_tests/style || exit 1
970+ cmd_test --no-build --no-kvm-check --no-build-dir-check --no-ci-artifacts-check -- -n 4 --doctest-modules framework || exit 1
963971}
964972
965973cmd_checkbuild () {
Original file line number Diff line number Diff line change @@ -32,7 +32,11 @@ if [ -f $CGROUP/cgroup.controllers -a -e $CGROUP/cgroup.type ]; then
3232fi
3333
3434say " Copy CI artifacts to /srv, so hardlinks work"
35- cp -ruvf build/img /srv
35+ if [ -d build/img ]; then
36+ cp -ruvf build/img /srv
37+ else
38+ say_warn " No build/img detected. Some tests might break"
39+ fi
3640
3741cd tests
3842export PYTEST_ADDOPTS=" ${PYTEST_ADDOPTS:- } --pdbcls=IPython.terminal.debugger:TerminalPdb"
You can’t perform that action at this time.
0 commit comments