From ef264604763456a52ab3cea5494919d4bb5bfd34 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 27 Mar 2025 12:18:38 +0100 Subject: [PATCH] CMake: Make the InitRepository test stdout checking more robust 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 --- .../RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt | 4 ++-- .../InitRepository/0050_ir_existing-stdout.txt | 4 ++-- .../0060_ir_shadertools_and_svg-stdout.txt | 6 +++--- .../0070_ir_qttools_with_deps-stdout.txt | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/manual/RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt b/tests/manual/RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt index 7e765d78..6c380b96 100644 --- a/tests/manual/RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt +++ b/tests/manual/RunCMake/InitRepository/0030_ir_qtsvg-stdout.txt @@ -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 diff --git a/tests/manual/RunCMake/InitRepository/0050_ir_existing-stdout.txt b/tests/manual/RunCMake/InitRepository/0050_ir_existing-stdout.txt index ef0476a9..16d66bc5 100644 --- a/tests/manual/RunCMake/InitRepository/0050_ir_existing-stdout.txt +++ b/tests/manual/RunCMake/InitRepository/0050_ir_existing-stdout.txt @@ -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 diff --git a/tests/manual/RunCMake/InitRepository/0060_ir_shadertools_and_svg-stdout.txt b/tests/manual/RunCMake/InitRepository/0060_ir_shadertools_and_svg-stdout.txt index 8922dcdd..7e2e12e5 100644 --- a/tests/manual/RunCMake/InitRepository/0060_ir_shadertools_and_svg-stdout.txt +++ b/tests/manual/RunCMake/InitRepository/0060_ir_shadertools_and_svg-stdout.txt @@ -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 diff --git a/tests/manual/RunCMake/InitRepository/0070_ir_qttools_with_deps-stdout.txt b/tests/manual/RunCMake/InitRepository/0070_ir_qttools_with_deps-stdout.txt index 56353c75..25f9167c 100644 --- a/tests/manual/RunCMake/InitRepository/0070_ir_qttools_with_deps-stdout.txt +++ b/tests/manual/RunCMake/InitRepository/0070_ir_qttools_with_deps-stdout.txt @@ -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