diff --git a/README.md b/README.md index e1fd3d9a38b203e1667069bbe95ec0ea6f6a6f74..177b3bf1b0b44e8d5cadbfd37596a7df81dca4e6 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ Build: Run: - $ docker run -it docker-qt-tests + $ docker run -e QT_DOCKERTEST_QTWAYLAND_REV=<sha1> -it docker-qt-tests diff --git a/scripts/build-qtbase-tests.sh b/scripts/build-qtbase-tests.sh index 00971c57b7acf740fe3e25acb56eac757eb7dde7..f0d8d12294099df3597ed111528e8753b92019b5 100755 --- a/scripts/build-qtbase-tests.sh +++ b/scripts/build-qtbase-tests.sh @@ -1,4 +1,4 @@ #!/bin/bash set -ex cd ~/build-qt/qtbase -make sub-tests +make sub-tests -ks diff --git a/scripts/build-qtwayland-tests.sh b/scripts/build-qtwayland-tests.sh index 2fbccda3f2d15bea9acbeb709f5bf85c140ec861..8654a0d372a2d7679b5e58dbe3aa2d67f92e7e75 100755 --- a/scripts/build-qtwayland-tests.sh +++ b/scripts/build-qtwayland-tests.sh @@ -1,4 +1,4 @@ #!/bin/bash set -ex cd ~/build-qt/qtwayland -make sub-tests +make sub-tests -ks diff --git a/scripts/clone-qt.sh b/scripts/clone-qt.sh index 0ae4eb7093423c5f78069ef7cb3f3e08148a4501..d2fdd50380a21dbd9286d92121a8046d0d4f46ec 100755 --- a/scripts/clone-qt.sh +++ b/scripts/clone-qt.sh @@ -1,9 +1,12 @@ #!/bin/bash set -ex qt5_rev=${QT_DOCKERTEST_QT5_REV:-5.11} -rm -rf qt5 -mkdir qt5 -cd qt5 + +srcdir=$(pwd)/qt5 +rm -rf $srcdir +mkdir $srcdir +cd $srcdir + git init git remote add origin https://codereview.qt-project.org/qt/qt5.git git fetch --depth 1 origin "$qt5_rev" @@ -14,7 +17,7 @@ git checkout FETCH_HEAD git submodule update --init --depth 50 -- qtbase qtxmlpatterns qtdeclarative qtwayland if [[ -v QT_DOCKERTEST_QTWAYLAND_REV ]] ; then - cd qtwayland + cd "$srcdir/qtwayland" git fetch --depth 1 origin "$QT_DOCKERTEST_QTWAYLAND_REV" git checkout FETCH_HEAD fi