From 8308e4b5386afbc7483be2b84f701accf1e20792 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 28 Nov 2019 12:07:27 +0100 Subject: [PATCH] Run widget tests after certain commit --- scripts/test-qt.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/test-qt.sh b/scripts/test-qt.sh index b5fa578..6495241 100755 --- a/scripts/test-qt.sh +++ b/scripts/test-qt.sh @@ -1,6 +1,7 @@ #!/bin/bash set -ex buildDir=$(pwd)/build-qt +srcDir=$(pwd)/qt5 weston --backend=headless-backend.so --idle-time=0 & # Give the compositor some time to start up @@ -19,9 +20,13 @@ sleep 5 #cd "$buildDir/qtbase/tests/auto/sql" && make check #cd "$buildDir/qtbase/tests/auto/testlib" && make check #cd "$buildDir/qtbase/tests/auto/tools" && make check -#cd "$buildDir/qtbase/tests/auto/widgets" && make check #cd "$buildDir/qtbase/tests/auto/xml" && make check +# Run widget tests after specfic commit in qtbase +if git --git-dir="$srcDir/qtbase/.git" merge-base --is-ancestor 52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 HEAD ; then + cd "$buildDir/qtbase/tests/auto/widgets" && make check +fi + # gui tests #cd "$buildDir/qtbase/tests/auto/gui/image" && make check #hangs -- 2.26.2