AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/android: Use common $RESULTS_DIR for cuttlefish

Browse Source 
Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31110>
This commit is contained in:
Daniel Stone
2024-08-21 11:57:52 +01:00
parent 9b6d14aed1
commit 4143199be7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci/cuttlefish-runner.sh
+6 -6
View File
@@ -88,11 +88,11 @@ $ADB shell rm /vendor/lib64/egl/libGLESv2_angle.so
$ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so $ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so
RESULTS=/data/results AOSP_RESULTS=/data/results
uncollapsed_section_switch cuttlefish_test "cuttlefish: testing" uncollapsed_section_switch cuttlefish_test "cuttlefish: testing"
set +e set +e
$ADB shell "mkdir /data/results; cd /data; ./deqp-runner \ $ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; ./deqp-runner \
suite \ suite \
--suite /data/deqp-$DEQP_SUITE.toml \ --suite /data/deqp-$DEQP_SUITE.toml \
--output $RESULTS \ --output $RESULTS \
@@ -108,11 +108,11 @@ EXIT_CODE=$?
set -e set -e
section_switch cuttlefish_results "cuttlefish: gathering the results" 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/logs/logcat $RESULTS_DIR
cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log results cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log $RESULTS_DIR
cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log results cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR
section_end cuttlefish_results section_end cuttlefish_results
exit $EXIT_CODE exit $EXIT_CODE