diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index fbeefa4bddd..44da4a82fa7 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -88,11 +88,11 @@ $ADB shell rm /vendor/lib64/egl/libGLESv2_angle.so $ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so -RESULTS=/data/results +AOSP_RESULTS=/data/results uncollapsed_section_switch cuttlefish_test "cuttlefish: testing" set +e -$ADB shell "mkdir /data/results; cd /data; ./deqp-runner \ +$ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; ./deqp-runner \ suite \ --suite /data/deqp-$DEQP_SUITE.toml \ --output $RESULTS \ @@ -108,11 +108,11 @@ EXIT_CODE=$? set -e section_switch cuttlefish_results "cuttlefish: gathering the results" -$ADB pull $RESULTS results +$ADB pull $RESULTS $RESULTS_DIR -cp /cuttlefish/cuttlefish/instances/cvd-1/logs/logcat results -cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log results -cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log results +cp /cuttlefish/cuttlefish/instances/cvd-1/logs/logcat $RESULTS_DIR +cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log $RESULTS_DIR +cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR section_end cuttlefish_results exit $EXIT_CODE