diff options
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.cpp | 4 | ||||
| -rw-r--r-- | config.tests/qpa/kms/kms.pro | 2 | ||||
| -rwxr-xr-x | config.tests/unix/compile.test | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp index a41c482b67..96935a2aa0 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp @@ -43,6 +43,8 @@ int main(int, char **) { - fbGetDisplay(); + // Do not rely on fbGetDisplay() since the signature has changed over time. + // Stick to fbGetDisplayByIndex(). + fbGetDisplayByIndex(0); return 0; } diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro index 1fb73677e7..5147bc82da 100644 --- a/config.tests/qpa/kms/kms.pro +++ b/config.tests/qpa/kms/kms.pro @@ -1,4 +1,4 @@ SOURCES = kms.cpp CONFIG += link_pkgconfig -PKGCONFIG += libdrm libudev +PKGCONFIG += libdrm CONFIG -= qt diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index 1228629aea..f5db1847b8 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -66,9 +66,6 @@ while [ "$#" -gt 0 ]; do shift done -# debuggery -[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)" - test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST" cd "$OUTDIR/$TEST" @@ -96,6 +93,7 @@ set -- \ "$SRCDIR/$TEST/$EXE.pro" \ -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then + echo OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes else OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes @@ -103,9 +101,9 @@ fi # done if [ "$SUCCESS" != "yes" ]; then - [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." + [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." || echo " no." exit 1 else - [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." + [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." || echo " yes." exit 0 fi |