set -ex
-DEQP_OPTIONS="--deqp-surface-width=256 --deqp-surface-height=256"
+DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=256 --deqp-surface-height=256"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=pbuffer"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=rgba8888d24s8ms0"
DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden"
exit 1
fi
-ARTIFACTS=`pwd`/artifacts
+INSTALL=`pwd`/install
# Set up the driver environment.
export LD_LIBRARY_PATH=`pwd`/install/lib/
sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
fi
+if [ -n "$DEQP_CASELIST_FILTER" ]; then
+ sed -i "/$DEQP_CASELIST_FILTER/p" /tmp/case-list.txt
+fi
+
if [ ! -s /tmp/case-list.txt ]; then
echo "Caselist generation failed"
exit 1
fi
if [ -n "$DEQP_EXPECTED_FAILS" ]; then
- XFAIL="--xfail-list $ARTIFACTS/$DEQP_EXPECTED_FAILS"
+ XFAIL="--xfail-list $INSTALL/$DEQP_EXPECTED_FAILS"
fi
set +e
--deqp $deqp \
--output $output \
--caselist $caselist \
- --exclude-list $ARTIFACTS/$DEQP_SKIPS \
+ --exclude-list $INSTALL/$DEQP_SKIPS \
+ --compact-display false \
$XFAIL \
$JOB \
--allow-flakes true \
return 0
fi
flakes=$1
- bot="$CI_RUNNER_DESCRIPTION-$CI_PIPELINE_ID"
+ # The nick needs to be something unique so that multiple runners
+ # connecting at the same time don't race for one nick and get blocked.
+ # freenode has a 16-char limit on nicks (9 is the IETF standard, but
+ # various servers extend that). So, trim off the common prefixes of the
+ # runner name, and append the job ID so that software runners with more
+ # than one concurrent job (think swrast) don't collide. For freedreno,
+ # that gives us a nick as long as db410c-N-JJJJJJJJ, and it'll be a while
+ # before we make it to 9-digit jobs (we're at 7 so far).
+ runner=`echo $CI_RUNNER_DESCRIPTION | sed 's|mesa-||' | sed 's|google-freedreno-||g'`
+ bot="$runner-$CI_JOB_ID"
channel="$FLAKES_CHANNEL"
(
echo NICK $bot
echo "JOIN $channel"
sleep 1
desc="Flakes detected in job: $CI_JOB_URL on $CI_RUNNER_DESCRIPTION"
- if [ -n "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then
+ if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then
desc="$desc on branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_MERGE_REQUEST_TITLE)"
+ elif [ -n "$CI_COMMIT_BRANCH" ]; then
+ desc="$desc on branch $CI_COMMIT_BRANCH ($CI_COMMIT_TITLE)"
fi
echo "PRIVMSG $channel :$desc"
for flake in `cat $flakes`; do
if [ "$line" = "#endTestCaseResult" ]; then
echo $line >> $dst
echo "#endSession" >> $dst
- /deqp/executor/testlog-to-xml $dst "$RESULTS/$testcase.xml"
+ /deqp/executor/testlog-to-xml $dst "$RESULTS/$testcase$DEQP_RUN_SUFFIX.xml"
# copy the stylesheets here so they only end up in artifacts
# if we have one or more result xml in artifacts
cp /deqp/testlog.css "$RESULTS/"
VERSION=`grep -A1 TestCaseResult.\*info.version $RESULTS/deqp-info.qpa | grep '<Text' | sed 's|.*<Text>||g' | sed 's|</Text>||g'`
echo "Renderer: $RENDERER"
echo "Version: $VERSION "
+
+ if ! echo $RENDERER | grep -q $DEQP_EXPECTED_RENDERER; then
+ echo "Expected GL_RENDERER $DEQP_EXPECTED_RENDERER"
+ exit 1
+ fi
}
check_renderer() {
# If you're having trouble loading your driver, uncommenting this may help
# debug.
# export EGL_LOG_LEVEL=debug
- $DEQP $DEQP_OPTIONS --deqp-case=dEQP-GLES2.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa
+ VERSION=`echo $DEQP_VER | tr '[a-z]' '[A-Z]'`
+ $DEQP $DEQP_OPTIONS --deqp-case=dEQP-$VERSION.info.\* --deqp-log-filename=$RESULTS/deqp-info.qpa
parse_renderer
}
set -x
}
+if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
+ # deqp is to use virpipe, and virgl_test_server llvmpipe
+ export GALLIUM_DRIVER="$GALLIUM_DRIVER"
+
+ GALLIUM_DRIVER=llvmpipe \
+ GALLIVM_PERF="nopt,no_filter_hacks" \
+ VTEST_USE_EGL_SURFACELESS=1 \
+ VTEST_USE_GLES=1 \
+ virgl_test_server >$RESULTS/vtest-log.txt 2>&1 &
+
+ sleep 1
+fi
+
if [ $DEQP_VER != vk ]; then
quiet check_renderer
fi
-run_cts $DEQP /tmp/case-list.txt $RESULTS/cts-runner-results.txt
+RESULTSFILE=$RESULTS/cts-runner-results$DEQP_RUN_SUFFIX.txt
+UNEXPECTED_RESULTSFILE=$RESULTS/cts-runner-unexpected-results$DEQP_RUN_SUFFIX.txt
+FLAKESFILE=$RESULTS/cts-runner-flakes$DEQP_RUN_SUFFIX.txt
+
+run_cts $DEQP /tmp/case-list.txt $RESULTSFILE
DEQP_EXITCODE=$?
# junit is disabled, because it overloads gitlab.freedesktop.org to parse it.
-#quiet generate_junit $RESULTS/cts-runner-results.txt > $RESULTS/results.xml
+#quiet generate_junit $RESULTSFILE > $RESULTS/results.xml
if [ $DEQP_EXITCODE -ne 0 ]; then
# preserve caselist files in case of failures:
cp /tmp/deqp_runner.*.txt $RESULTS/
- cat $RESULTS/cts-runner-results.txt | \
- grep -v ",Pass" | \
- grep -v ",Skip" | \
- grep -v ",ExpectedFail" > \
- $RESULTS/cts-runner-unexpected-results.txt
+ egrep -v ",Pass|,Skip|,ExpectedFail" $RESULTSFILE > $UNEXPECTED_RESULTSFILE.txt
if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):"
- head -n 50 $RESULTS/cts-runner-unexpected-results.txt
+ head -n 50 $UNEXPECTED_RESULTSFILE.txt
# Save the logs for up to the first 50 unexpected results:
- head -n 50 $RESULTS/cts-runner-unexpected-results.txt | quiet extract_xml_results /tmp/*.qpa
+ head -n 50 $UNEXPECTED_RESULTSFILE.txt | quiet extract_xml_results /tmp/*.qpa
else
echo "Unexpected results found:"
- cat $RESULTS/cts-runner-unexpected-results.txt
+ cat $UNEXPECTED_RESULTSFILE.txt
fi
- count=`cat $RESULTS/cts-runner-unexpected-results.txt | wc -l`
+ count=`cat $UNEXPECTED_RESULTSFILE.txt | wc -l`
# Re-run fails to detect flakes. But use a small threshold, if
# something was fundamentally broken, we don't want to re-run
# the entire caselist
else
- cat $RESULTS/cts-runner-results.txt | \
- grep ",Flake" > \
- $RESULTS/cts-runner-flakes.txt
+ grep ",Flake" $RESULTSFILE > $FLAKESFILE
- count=`cat $RESULTS/cts-runner-flakes.txt | wc -l`
+ count=`cat $FLAKESFILE | wc -l`
if [ $count -gt 0 ]; then
echo "Some flakes found (see cts-runner-flakes.txt in artifacts for full results):"
- head -n 50 $RESULTS/cts-runner-flakes.txt
+ head -n 50 $FLAKESFILE
if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
# Save the logs for up to the first 50 flakes:
- head -n 50 $RESULTS/cts-runner-flakes.txt | quiet extract_xml_results /tmp/*.qpa
+ head -n 50 $FLAKESFILE | quiet extract_xml_results /tmp/*.qpa
fi
# Report the flakes to IRC channel for monitoring (if configured):
- quiet report_flakes $RESULTS/cts-runner-flakes.txt
+ quiet report_flakes $FLAKESFILE
else
# no flakes, so clean-up:
- rm $RESULTS/cts-runner-flakes.txt
+ rm $FLAKESFILE
fi
fi
projects / mesa.git / blobdiff