diff options
| author | Adam Jackson <[email protected]> | 2019-09-16 20:44:12 -0400 |
|---|---|---|
| committer | Adam Jackson <[email protected]> | 2019-09-17 14:53:57 -0400 |
| commit | 6ec1259423fdbf491813f8b5db9af2fe022e8a86 (patch) | |
| tree | fed5501001e5395d95f2a37ac365f9cbac8c8589 /.gitlab-ci | |
| parent | dd1dba80b9ee74ec8b90761285a8262e374bf8ef (diff) | |
ci: Run tests on i386 cross builds
Yes, some tests fail, but we can turn those into XFAILs at meson time.
Better to keep the things that work working than not cover them at all.
Unfortunately XPASS results will not cause the build to fail until we
update CI to meson 0.51 or newer.
Reviewed-by: Daniel Stone <[email protected]>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/cross-xfail-i386 | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 27 |
2 files changed, 26 insertions, 2 deletions
diff --git a/.gitlab-ci/cross-xfail-i386 b/.gitlab-ci/cross-xfail-i386 new file mode 100644 index 00000000000..b4a3ea4d989 --- /dev/null +++ b/.gitlab-ci/cross-xfail-i386 @@ -0,0 +1 @@ +u_format_test diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index 7e74095c4bb..cd0b62e4767 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -14,9 +14,32 @@ else touch native.file fi +CROSS_FILE=/cross_file-"$CROSS".txt + +# cross-xfail-$CROSS, if it exists, contains a list of tests that are expected +# to fail for the $CROSS configuration, one per line. you can then mark those +# tests in their meson.build with: +# +# test(..., +# should_fail: meson.get_cross_property('xfail', '').contains(t), +# ) +# +# where t is the name of the test, and the '' is the string to search when +# not cross-compiling (which is empty, because for amd64 everything is +# expected to pass). +if [ -n "$CROSS" ]; then + CROSS_XFAIL=.gitlab-ci/cross-xfail-"$CROSS" + if [ -s "$CROSS_XFAIL" ]; then + sed -i \ + -e '/\[properties\]/a\' \ + -e "xfail = '$(tr '\n' , < $CROSS_XFAIL)'" \ + "$CROSS_FILE" + fi +fi + rm -rf _build meson _build --native-file=native.file \ - ${CROSS+--cross /cross_file-$CROSS.txt} \ + ${CROSS+--cross "$CROSS_FILE"} \ -D prefix=`pwd`/install \ -D libdir=lib \ -D buildtype=${BUILDTYPE:-debug} \ @@ -45,7 +68,7 @@ rm -rf install/include # Strip the drivers in the artifacts to cut 80% of the artifacts size. if [ -n "$CROSS" ]; then - STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" /cross_file-$CROSS.txt` + STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"` if [ -z "$STRIP" ]; then echo "Failed to find strip command in cross file" exit 1 |