lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-06 16:28:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Make the InitRepository test stdout checking more robust

Browse Source 
The previous stdout regular expressions were expect the build dir to
be in the source dir. Relax that constraint, so any build dir can be
used.
Keep the generated 'tmp' part as the indicator for the build dir.

Change-Id: Ib8c2bf31f80926b9209948a5c70859e086ed71a1
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor
2025-03-27 12:18:38 +01:00
parent f1b7f8c83f
commit ef26460476
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/manual/RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt
View File

@@ -1,9 +1,9 @@
\+ git submodule init qtsvg
Submodule 'qtsvg' \(https://code.qt.io/qt/qtsvg.git\) registered for path 'qtsvg'
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git clone --no-checkout https://code.qt.io/qt/qtsvg.git qtsvg
Cloning into 'qtsvg'...
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git submodule update --force --no-fetch

4
tests/manual/RunCMake/InitRepository/0050_ir_existing-stdout.txt
View File

@@ -1,8 +1,8 @@
\+ git submodule init qtsvg
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.origin.url https://code.qt.io/qt/qtsvg.git
\+ git fetch origin
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git submodule update --force --no-fetch

6
tests/manual/RunCMake/InitRepository/0060_ir_shadertools_and_svg-stdout.txt
View File

@@ -1,14 +1,14 @@
\+ git submodule init qtshadertools qtsvg
Submodule 'qtshadertools' \(https://code.qt.io/qt/qtshadertools.git\) registered for path 'qtshadertools'
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git clone --no-checkout https://code.qt.io/qt/qtshadertools.git qtshadertools
Cloning into 'qtshadertools'...
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtshadertools.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git config remote.origin.url https://code.qt.io/qt/qtsvg.git
\+ git fetch origin
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git submodule update --force --no-fetch

10
tests/manual/RunCMake/InitRepository/0070_ir_qttools_with_deps-stdout.txt
View File

@@ -2,25 +2,25 @@
\+ git submodule init qtshadertools qtsvg qtactiveqt qttools
Submodule 'qtactiveqt' \(https://code.qt.io/qt/qtactiveqt.git\) registered for path 'qtactiveqt'
Submodule 'qttools' \(https://code.qt.io/qt/qttools.git\) registered for path 'qttools'
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.origin.url https://code.qt.io/qt/qtshadertools.git
\+ git fetch origin
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtshadertools.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git config remote.origin.url https://code.qt.io/qt/qtsvg.git
\+ git fetch origin
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtsvg.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git clone --no-checkout https://code.qt.io/qt/qtactiveqt.git qtactiveqt
Cloning into 'qtactiveqt'...
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qtactiveqt.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git clone --no-checkout https://code.qt.io/qt/qttools.git qttools
Cloning into 'qttools'...
\+ git config commit.template .+/tests/manual/RunCMake/build/tmp.+/qt6/.commit-template
\+ git config commit.template .+tmp.+/qt6/.commit-template
\+ git config remote.gerrit.url ssh://codereview.qt-project.org/qt/qttools.git
\+ git config remote.gerrit.fetch \+refs/heads/\*:refs/remotes/gerrit/\* /heads/
\+ git submodule update --force --no-fetch