Skip to contentSkip to conversation

ahci-test: Add dependency to qemu-img tool

RFC PATCH Superseded Philippe Mathieu-Daudé 3 participants 5 messages Jan 25, 2019 – Jan 29, 2019

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ahci-test: Add dependency to qemu-img tool

Since the ahci-test uses qemu-img, add a dependency to build it before using it.
This fixes:

  $ gmake check-qtest V=1
  QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test
  Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory)
  ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)

---
RFC because while this dependency is valid, I don't think this is the clever way to solve this problem (which is, assuming the host distribution has the qemu-tools installed).
I guess remember a thread about it (Eric, John?) where it was asked "What do we want to test, qemu-img or AHCI? Can we trust an unstable version of a tool to verify a device?"

Slighly related is when vm-tests expect qemu-img available:
https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg08415.html

  $ make vm-build-ubuntu.i386
  Traceback (most recent call last):
    File "source/qemu/tests/vm/basevm.py", line 236, in main
      return vm.build_image(args.image)
    File "tests/vm/ubuntu.i386", line 67, in build_image
      subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"])
  OSError: [Errno 2] No such file or directory
  tests/vm/Makefile.include:23: recipe for target 'tests/vm/ubuntu.i386.img' failed
  make: *** [tests/vm/ubuntu.i386.img] Error 2

A better fix would be checking those tools via ./configure...

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
index 19b4c0a696..5e03416c81 100644
@@ -706,7 +706,7 @@ tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
 tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
 tests/fdc-test$(EXESUF): tests/fdc-test.o
 tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
-tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
+tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF)
 tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
 tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
 tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Philippe Mathieu-Daudé

Since the ahci-test uses qemu-img, add a dependency to build it before using it.
This fixes:

  $ gmake check-qtest V=1
  QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test
  Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory)
  ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)
Quoted 9 lines

---
RFC because while this dependency is valid, I don't think this is the clever way to solve this problem (which is, assuming the host distribution has the qemu-tools installed).
I guess remember a thread about it (Eric, John?) where it was asked "What do we want to test, qemu-img or AHCI? Can we trust an unstable version of a tool to verify a device?"

Yeah, these discussions have a great track record of preventing us from fixing problems.

Here's my two cents: "make check" already exports QTEST_QEMU_IMG as the one we're building and gets passed to ahci-test -- might as well make the dependency explicit in that same way.

Quoted 24 lines

Slighly related is when vm-tests expect qemu-img available:
https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg08415.html

  $ make vm-build-ubuntu.i386
  Traceback (most recent call last):
    File "source/qemu/tests/vm/basevm.py", line 236, in main
      return vm.build_image(args.image)
    File "tests/vm/ubuntu.i386", line 67, in build_image
      subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"])
  OSError: [Errno 2] No such file or directory
  tests/vm/Makefile.include:23: recipe for target 'tests/vm/ubuntu.i386.img' failed
  make: *** [tests/vm/ubuntu.i386.img] Error 2

A better fix would be checking those tools via ./configure...

---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +0 -0
index 19b4c0a696..5e03416c81 100644

tests/Makefile.include tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) · line 712

Quoted 8 lines
tests/Makefile.include +1 -1
@@ -706,7 +706,7 @@ tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
 tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
 tests/fdc-test$(EXESUF): tests/fdc-test.o
 tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
-tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
+tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF)
 tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
 tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
 tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
#2 lore raw

Am 25.01.2019 um 22:57 hat John Snow geschrieben:

Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 9 lines

Since the ahci-test uses qemu-img, add a dependency to build it before using it.
This fixes:

  $ gmake check-qtest V=1
  QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test
  Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory)
  ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)
Quoted 9 lines

---
RFC because while this dependency is valid, I don't think this is the clever way to solve this problem (which is, assuming the host distribution has the qemu-tools installed).
I guess remember a thread about it (Eric, John?) where it was asked "What do we want to test, qemu-img or AHCI? Can we trust an unstable version of a tool to verify a device?"

Quoted 3 lines

[...]

Are you taking this through your tree, or through which tree should it be merged?

Kevin

#3 lore raw
Quoted 20 lines · Kevin Wolf

Am 25.01.2019 um 22:57 hat John Snow geschrieben:

Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 18 lines

Since the ahci-test uses qemu-img, add a dependency to build it before using it.
This fixes:

  $ gmake check-qtest V=1
  QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test
  Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory)
  ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)

---
RFC because while this dependency is valid, I don't think this is the clever way to solve this problem (which is, assuming the host distribution has the qemu-tools installed).
I guess remember a thread about it (Eric, John?) where it was asked "What do we want to test, qemu-img or AHCI? Can we trust an unstable version of a tool to verify a device?"

Quoted 9 lines
Quoted 3 lines

[...]

Are you taking this through your tree, or through which tree should it be merged?

Kevin

I can, but it'd be the only patch I have this week. If it's not a burden, would you mind including it?

#4 lore raw
Quoted 25 lines · John Snow
Quoted 24 lines · Kevin Wolf

Am 25.01.2019 um 22:57 hat John Snow geschrieben:

Quoted 22 lines · Philippe Mathieu-Daudé
Quoted 18 lines

Since the ahci-test uses qemu-img, add a dependency to build it before using it.
This fixes:

  $ gmake check-qtest V=1
  QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test
  Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory)
  ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)

---
RFC because while this dependency is valid, I don't think this is the clever way to solve this problem (which is, assuming the host distribution has the qemu-tools installed).
I guess remember a thread about it (Eric, John?) where it was asked "What do we want to test, qemu-img or AHCI? Can we trust an unstable version of a tool to verify a device?"

[...]

Quoted 8 lines
Quoted 5 lines

Are you taking this through your tree, or through which tree should it be merged?

Kevin

I can, but it'd be the only patch I have this week. If it's not a burden, would you mind including it?

Actually there are few follow up patches slighly related (not AHCI), so it indeed makes sense Kevin takes them. I'll respin.