@@ -401,7 +401,6 @@ function BuildStandaloneDynamicBackend {
401401# push sources to board
402402function PushBuildSourcesToBoard {
403403 cd $WORKING_DIR /armnn/build
404- adb start-server
405404 adb shell rm -rf /data/local/tmp/*
406405 echo " +++ Pushing sources to board"
407406 adb root
@@ -451,12 +450,33 @@ function PushBuildSourcesToBoard {
451450 adb push -p ${WORKING_DIR} /armnn/src/dynamic/sample/build/libArm_SampleDynamic_backend.so /data/local/tmp/dynamic/sample/
452451 fi
453452 echo " +++ Running UnitTests"
454- adb shell LD_LIBRARY_PATH=/data/local/tmp:/vendor/lib64:/vendor/lib64/egl /data/local/tmp/UnitTests ; printf $?
453+ adb shell LD_LIBRARY_PATH=/data/local/tmp:/vendor/lib64:/vendor/lib64/egl /data/local/tmp/UnitTests
454+ TEST_RESULT=$?
455+ printf ' %s\n' " $TEST_RESULT "
456+ if [[ $TEST_RESULT -ne 0 ]]; then
457+ echo " Tests failed"
458+ exit 1
459+ fi
455460 if [[ $DELEGATE == 1 ]]; then
456- adb shell LD_LIBRARY_PATH=/data/local/tmp:/vendor/lib64:/vendor/lib64/egl /data/local/tmp/DelegateUnitTests ; printf $?
461+ adb shell LD_LIBRARY_PATH=/data/local/tmp:/vendor/lib64:/vendor/lib64/egl /data/local/tmp/DelegateUnitTests
462+ TEST_RESULT=$?
463+ printf ' %s\n' " $TEST_RESULT "
464+ if [[ $TEST_RESULT -ne 0 ]]; then
465+ echo " DelegateTests failed"
466+ exit 1
467+ fi
457468 fi
458469}
459470
471+ verifyAdbConnection () {
472+ adb devices | grep -w " device" > /dev/null
473+ if [[ $? != 0 ]]; then
474+ echo " No connected Android device found. Please connect a device and enable ADB."
475+ return 1
476+ fi
477+ return 0
478+ }
479+
460480# Cleanup any previous runs, setup clean directories
461481echo " +++ Creating $WORKING_DIR directory"
462482mkdir -p $WORKING_DIR
506526if [[ $DYNAMIC_SAMPLE == 1 ]]; then
507527 BuildStandaloneDynamicBackend
508528fi
529+ verifyAdbConnection
530+ if [[ $? != 0 ]] ; then
531+ echo " ADB connection failed"
532+ exit 1
533+ fi
509534if [[ $PUSH_TO_BOARD == 1 ]]; then
510535 PushBuildSourcesToBoard
511536fi
0 commit comments