[neon/extras/clazy/Neon/release] debian: run-tests autopkgtest: adapt to clazy-tests

[Pino Toscano]

Git commit 754d3c8141c121ab3aa9485d9007e45046ff2e22 by Pino Toscano.
Committed on 01/11/2020 at 16:43.
Pushed by jriddell into branch 'Neon/release'.

run-tests autopkgtest: adapt to clazy-tests

M  +5    -0    debian/changelog
M  +1    -1    debian/tests/control
M  +6    -2    debian/tests/run-tests

https://invent.kde.org/neon/extras/clazy/commit/754d3c8141c121ab3aa9485d9007e45046ff2e22

diff --git a/debian/changelog b/debian/changelog
index 989dd26..4555dac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ clazy (1.7-4) UNRELEASED; urgency=medium
       the default version of clang-apply-replacements
   * Ship a shell file /usr/share/clazy/debian-$(DPKG_ARCHITECTURE).sh in
     clazy-tests with the paths of clang and clang-apply-replacements.
+  * Adapt the run-tests autopkgtest to clazy-tests:
+    - replace the clang, and clang-tools dependencies with clazy-tests
+    - source the shell configuration file provided by clazy-tests
+    - export the right environment variables for clang, and
+      clang-apply-replacements, so the upstream test script can use them
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Oct 2020 05:48:39 -0700
 
diff --git a/debian/tests/control b/debian/tests/control
index e540fd7..6dfbad9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-tests
-Depends: @, clang, clang-tools, python3, qtbase5-dev, qtdeclarative5-dev
+Depends: @, clazy-tests, python3, qtbase5-dev, qtdeclarative5-dev
 Restrictions: rw-build-tree, allow-stderr
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 0e02118..af51039 100755
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,9 +2,13 @@
 
 set -e
 
+. /usr/share/clazy/debian-$(dpkg --print-architecture).sh
+export CLANGXX="${CLANG}"
+export CLAZY_CLANG_APPLY_REPLACEMENTS="${CLANG_APPLY_REPLACEMENTS}"
+
 # show some facts about clang/clang++, so it is easier to debug issues
-clang -E -x c - -v < /dev/null
-clang++ -E -x c++ - -v < /dev/null
+${CLANGXX} -E -x c - -v < /dev/null
+${CLANGXX} -E -x c++ - -v < /dev/null
 
 cd tests
 ./run_tests.py --verbose