aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/meson.build6
-rwxr-xr-xtest/test-lspci.sh5
2 files changed, 8 insertions, 3 deletions
diff --git a/test/meson.build b/test/meson.build
index ba6f7c5..1c3aef5 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -83,14 +83,14 @@ test(
timeout: 90,
)
-if opt_sanitizers == 'none'
+if opt_sanitizers == 'none' and meson.version().version_compare('>=0.56.0')
test(
'test-linkage.sh',
find_program('test-linkage.sh'),
suite: 'functional',
args: [
- meson.source_root(),
- meson.build_root(),
+ meson.project_source_root(),
+ meson.project_build_root(),
' '.join(cc.cmd_array()),
]
)
diff --git a/test/test-lspci.sh b/test/test-lspci.sh
index 91adb13..9cf402f 100755
--- a/test/test-lspci.sh
+++ b/test/test-lspci.sh
@@ -7,6 +7,11 @@
LSPCI=../samples/lspci
+if ! command -v lspci &> /dev/null
+then
+ exit 77
+fi
+
test -n "$1" && LSPCI="$1"
$LSPCI | lspci -vv -F /dev/stdin >lspci.out