From 0725b7a11a8e68e3b3e4c2ab5dae87cc94fbac5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Tue, 15 Feb 2022 08:15:50 +0100 Subject: [PATCH] tests: parametrize package name in embedded interpreter test It's different in collection, and therefore rpm query fails. --- tests/python-embedded-interpreter/main.fmf | 4 ++++ tests/python-embedded-interpreter/test.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/python-embedded-interpreter/main.fmf b/tests/python-embedded-interpreter/main.fmf index 273535c..7b27e59 100644 --- a/tests/python-embedded-interpreter/main.fmf +++ b/tests/python-embedded-interpreter/main.fmf @@ -6,9 +6,13 @@ adjust: # Common requirements when LLVM is not SCL-ized - require+: - lldb + environment+: + LLDB_PACKAGE: lldb when: "collection is not defined" # Requirements for SCL-ized LLVM - require+: - llvm-toolset-13.0-lldb + environment+: + LLDB_PACKAGE: llvm-toolset-13.0-lldb when: "collection == llvm-toolset-13.0" diff --git a/tests/python-embedded-interpreter/test.sh b/tests/python-embedded-interpreter/test.sh index 45cd651..888ae61 100755 --- a/tests/python-embedded-interpreter/test.sh +++ b/tests/python-embedded-interpreter/test.sh @@ -1,7 +1,7 @@ #!/bin/sh -eux # Verify the formal side of things, lldb should really depend on its Python bits. -rpm -q --requires lldb | grep python3-lldb +rpm -q --requires "$LLDB_PACKAGE" | grep python3-lldb # Then verify things actually works. g++ -g test.cpp