Fix tests.
This commit is contained in:
parent
d35741a127
commit
06b032cc84
26
0001-tests-Run-just-built-nbdkit-not-installed-nbdkit.patch
Normal file
26
0001-tests-Run-just-built-nbdkit-not-installed-nbdkit.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From dcf767f55bcaf52fc7079b653749cccfe493b443 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
Date: Sun, 1 Dec 2019 20:13:30 +0000
|
||||||
|
Subject: [PATCH] tests: Run just built nbdkit, not installed nbdkit.
|
||||||
|
|
||||||
|
Fixes commit 7adcf1bd47c678c1f3489c02f138b32c99657a24.
|
||||||
|
---
|
||||||
|
tests/Makefile.am | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||||
|
index 878ff59..f6508a6 100644
|
||||||
|
--- a/tests/Makefile.am
|
||||||
|
+++ b/tests/Makefile.am
|
||||||
|
@@ -443,7 +443,7 @@ disk:
|
||||||
|
rm -rf disk.tmp $@ $@-t
|
||||||
|
mkdir disk.tmp
|
||||||
|
echo -n "hello,world" > disk.tmp/hello.txt
|
||||||
|
- nbdkit -fv -U - linuxdisk disk.tmp size=100M \
|
||||||
|
+ $(top_builddir)/nbdkit -fv -U - linuxdisk disk.tmp size=100M \
|
||||||
|
--run 'qemu-img convert $$nbd $@-t'
|
||||||
|
rm -rf disk.tmp
|
||||||
|
mv $@-t $@
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
@ -26,7 +26,7 @@
|
|||||||
%global verify_tarball_signature 1
|
%global verify_tarball_signature 1
|
||||||
|
|
||||||
# If there are patches which touch autotools files, set this to 1.
|
# If there are patches which touch autotools files, set this to 1.
|
||||||
%global patches_touch_autotools %{nil}
|
%global patches_touch_autotools 1
|
||||||
|
|
||||||
# The source directory.
|
# The source directory.
|
||||||
%global source_directory 1.17-development
|
%global source_directory 1.17-development
|
||||||
@ -46,6 +46,9 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
|
|||||||
Source2: libguestfs.keyring
|
Source2: libguestfs.keyring
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Upstream patch which fixes the tests.
|
||||||
|
Patch1: 0001-tests-Run-just-built-nbdkit-not-installed-nbdkit.patch
|
||||||
|
|
||||||
%if 0%{patches_touch_autotools}
|
%if 0%{patches_touch_autotools}
|
||||||
BuildRequires: autoconf, automake, libtool
|
BuildRequires: autoconf, automake, libtool
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user