From 5d7688d26f616831731a550f4a422f67aed9d21f Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 6 Jul 2022 17:29:04 +1000 Subject: tests: Remove not-very-useful "req" directive The test scripts support a "req" directive which requires one test script to be run before another. It's implemented by doing a topological sort based on these directives in the runner scripts, which is about as awkward as you'd expect in Bourne shell. It turns out we only use this functionality in one place - to make the "make install" test run after the plain "make" test. We also already have a simpler way of making sure tests run in a specific order: just put them into the same test script file. So, remove support for the "req" directive and just fold the build/all and build/install test scripts together. Signed-off-by: David Gibson --- test/build/all | 22 +++++++++++++++++++++- test/build/install | 34 ---------------------------------- 2 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 test/build/install (limited to 'test/build') diff --git a/test/build/all b/test/build/all index 6043793..1a89b77 100644 --- a/test/build/all +++ b/test/build/all @@ -11,7 +11,7 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio -htools make cc rm uname getconf +htools make cc rm uname getconf mkdir cp rm man test Build passt host make clean @@ -40,3 +40,23 @@ host CFLAGS="-Werror" make check [ -f passt ] check [ -h pasta ] check [ -f qrap ] + +tempdir TEMP + +test Install +host prefix=__TEMP__ make install +check [ -f __TEMP__/bin/passt ] +check [ -h __TEMP__/bin/pasta ] +check [ -f __TEMP__/bin/qrap ] +check man -M __TEMP__/share/man -W passt +check man -M __TEMP__/share/man -W pasta +check man -M __TEMP__/share/man -W qrap + +test Uninstall +host prefix=__TEMP__ make uninstall +check ! [ -f __TEMP__/bin/passt ] +check ! [ -h __TEMP__/bin/pasta ] +check ! [ -f __TEMP__/bin/qrap ] +check ! man -M __TEMP__/share/man -W passt 2>/dev/null +check ! man -M __TEMP__/share/man -W pasta 2>/dev/null +check ! man -M __TEMP__/share/man -W qrap 2>/dev/null diff --git a/test/build/install b/test/build/install deleted file mode 100644 index 2c93647..0000000 --- a/test/build/install +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later -# -# PASST - Plug A Simple Socket Transport -# for qemu/UNIX domain socket mode -# -# PASTA - Pack A Subtle Tap Abstraction -# for network namespace/tap device mode -# -# test/build/install - Check that binaries and man pages can be installed -# -# Copyright (c) 2021 Red Hat GmbH -# Author: Stefano Brivio - -req build/all -htools make mkdir cp rm man -tempdir TEMP - -test Install -host prefix=__TEMP__ make install -check [ -f __TEMP__/bin/passt ] -check [ -h __TEMP__/bin/pasta ] -check [ -f __TEMP__/bin/qrap ] -check man -M __TEMP__/share/man -W passt -check man -M __TEMP__/share/man -W pasta -check man -M __TEMP__/share/man -W qrap - -test Uninstall -host prefix=__TEMP__ make uninstall -check ! [ -f __TEMP__/bin/passt ] -check ! [ -h __TEMP__/bin/pasta ] -check ! [ -f __TEMP__/bin/qrap ] -check ! man -M __TEMP__/share/man -W passt 2>/dev/null -check ! man -M __TEMP__/share/man -W pasta 2>/dev/null -check ! man -M __TEMP__/share/man -W qrap 2>/dev/null -- cgit v1.2.3