On Thu, 2023-01-12 at 17:28 +0100, Roberto Sassu wrote: > On Thu, 2023-01-12 at 11:26 -0500, Stefan Berger wrote: > > > > On 1/12/23 11:20, Roberto Sassu wrote: > > > On Thu, 2023-01-12 at 11:11 -0500, Stefan Berger wrote: > > > > On 1/12/23 07:24, Roberto Sassu wrote: > > > > > From: Roberto Sassu <roberto.sassu@xxxxxxxxxx> > > > > > > > > > > Instead of making changes to the system, use in-place built fsverity binary > > > > > by adding ../fsverity-utils to the PATH variable, so that the binary can be > > > > > found with the 'which' command. > > > > > > > > > > Signed-off-by: Roberto Sassu <roberto.sassu@xxxxxxxxxx> > > > > > > > > Reviewed-by: Stefan Berger <stefanb@xxxxxxxxxxxxx> > > > > > > > > > --- > > > > > tests/fsverity.test | 2 +- > > > > > tests/install-fsverity.sh | 2 +- > > > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > > > > > diff --git a/tests/fsverity.test b/tests/fsverity.test > > > > > index 84312aa08a30..e05978be7ea6 100755 > > > > > --- a/tests/fsverity.test > > > > > +++ b/tests/fsverity.test > > > > > @@ -30,7 +30,7 @@ > > > > > # custom policy rules might take precedence. > > > > > > > > > > cd "$(dirname "$0")" || exit 1 > > > > > -PATH=../src:$PATH > > > > > +PATH=../src:../fsverity-utils:$PATH > > > > > source ./functions.sh > > > > > > > > > > # Base VERBOSE on the environment variable, if set. > > > > > diff --git a/tests/install-fsverity.sh b/tests/install-fsverity.sh > > > > > index 418fc42f472b..d00674c0d3a2 100755 > > > > > --- a/tests/install-fsverity.sh > > > > > +++ b/tests/install-fsverity.sh > > > > > @@ -2,6 +2,6 @@ > > > > > > > > > > git clone https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git > > > > > cd fsverity-utils > > > > > -CC=gcc make -j$(nproc) && sudo make install > > > > > +CC=gcc make -j$(nproc) > > > > > cd .. > > > > > rm -rf fsverity-utils > > > > > > Argh... same problem. > > > > > > Will just delete the last two lines. It is just for CI. > > > > Must be skipping tests when the tool is not found > > Yes, it does: > > SKIP: fsverity is not installed > PASS: 0 SKIP: 0 FAIL: 0 RH doesn't have the fsverity-utils package. tests/install-fsverity.sh builds and installs it. The script ci/fedora.sh builds and installs it. Mimi
