From 3338bd284f46831edaa590abb8c9d996aa817d39 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Wed, 20 May 2020 00:00:13 -0700 Subject: [PATCH] fix run_docker_tests.sh old-commit-hash: 04047d835fd0392426eb4ff22829a1dcd5eb0567 --- run_docker_tests.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/run_docker_tests.sh b/run_docker_tests.sh index 1247c24de1..92cd57b87a 100755 --- a/run_docker_tests.sh +++ b/run_docker_tests.sh @@ -2,21 +2,22 @@ set -e SETUP="cd /tmp/openpilot && " -RUN="docker run --shm-size 1G --rm tmppilot /bin/sh -c" +BUILD="cd /tmp/openpilot && scons -c && scons -j$(nproc) && " +RUN="docker run --shm-size 1G --rm tmppilot /bin/bash -c" docker build -t tmppilot -f Dockerfile.openpilot . $RUN "$SETUP cd /tmp/openpilot/selfdrive/test/ && ./test_fingerprints.py" $RUN "$SETUP ./flake8_openpilot.sh" $RUN "$SETUP ./pylint_openpilot.sh" -$RUN "$SETUP python -m unittest discover common" -$RUN "$SETUP python -m unittest discover opendbc/can" -$RUN "$SETUP python -m unittest discover selfdrive/boardd" -$RUN "$SETUP python -m unittest discover selfdrive/controls" -$RUN "$SETUP python -m unittest discover selfdrive/loggerd" -$RUN "$SETUP python -m unittest discover selfdrive/car" -$RUN "$SETUP python -m unittest discover selfdrive/locationd" -$RUN "$SETUP python -m unittest discover selfdrive/athena" -$RUN "$SETUP cd /tmp/openpilot/selfdrive/test/longitudinal_maneuvers && OPTEST=1 ./test_longitudinal.py" -$RUN "$SETUP cd /tmp/openpilot/selfdrive/test/process_replay/ && ./test_processes.py" -$RUN "$SETUP mkdir -p /data/params && cd /tmp/openpilot/selfdrive/test/ && ./test_car_models.py" +$RUN "$BUILD python -m unittest discover common && \ + python -m unittest discover opendbc/can && \ + python -m unittest discover selfdrive/boardd && \ + python -m unittest discover selfdrive/controls && \ + python -m unittest discover selfdrive/loggerd && \ + python -m unittest discover selfdrive/car && \ + python -m unittest discover selfdrive/locationd && \ + python -m unittest discover selfdrive/athena" +$RUN "$BUILD cd /tmp/openpilot/selfdrive/test/longitudinal_maneuvers && OPTEST=1 ./test_longitudinal.py" +$RUN "$BUILD cd /tmp/openpilot/selfdrive/test/process_replay/ && ./test_processes.py" +$RUN "$BUILD mkdir -p /data/params && cd /tmp/openpilot/selfdrive/test/ && ./test_car_models.py"