From: Marc-André Lureau <marcandre.lur...@redhat.com>
Since commit a2ce7dbd917 ("meson: convert tests/qtest to meson"),
libqtest.h is under libqos/ directory. Let's move the .c along with it.
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
docs/devel/qtest.rst | 4 ++--
tests/qtest/{ => libqos}/libqtest.c | 4 ++--
tests/qtest/libqos/meson.build | 2 +-
tests/unit/meson.build | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
rename tests/qtest/{ => libqos}/libqtest.c (99%)
diff --git a/docs/devel/qtest.rst b/docs/devel/qtest.rst
index c3dceb6c8a1d..a9a6b0a7466b 100644
--- a/docs/devel/qtest.rst
+++ b/docs/devel/qtest.rst
@@ -18,8 +18,8 @@ QTest cases can be executed with
make check-qtest
-The QTest library is implemented by ``tests/qtest/libqtest.c`` and the API is
-defined in ``tests/qtest/libqtest.h``.
+The QTest library is implemented by ``tests/qtest/libqos/libqtest.c`` and the
API is
+defined in ``tests/qtest/libqos/libqtest.h``.
Consider adding a new QTest case when you are introducing a new virtual
hardware, or extending one if you are adding functionalities to an existing
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqos/libqtest.c
similarity index 99%
rename from tests/qtest/libqtest.c
rename to tests/qtest/libqos/libqtest.c
index 2b9bdb947d6f..9097329ce435 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqos/libqtest.c
@@ -20,7 +20,7 @@
#include <sys/wait.h>
#include <sys/un.h>
-#include "libqos/libqtest.h"
+#include "libqtest.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
@@ -268,7 +268,7 @@ QTestState *qtest_init_without_qmp_handshake(const char
*extra_args)
/* It's possible that if an earlier test run crashed it might
* have left a stale unix socket lying around. Delete any
* stale old socket to avoid spurious test failures with
- * tests/libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 !=
-1)
+ * libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1)
*/
unlink(socket_path);
unlink(qmp_socket_path);
diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
index e988d1579172..0c172f27533a 100644
--- a/tests/qtest/libqos/meson.build
+++ b/tests/qtest/libqos/meson.build
@@ -1,4 +1,4 @@
-libqos_srcs = files('../libqtest.c',
+libqos_srcs = files('libqtest.c',
'qgraph.c',
'qos_external.c',
'pci.c',
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index ab01e00f12cf..188b0ea80c37 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -154,7 +154,7 @@ if have_system
endif
if have_ga and targetos == 'linux'
- tests += {'test-qga': ['../qtest/libqtest.c']}
+ tests += {'test-qga': ['../qtest/libqos/libqtest.c']}
test_deps += {'test-qga': qga}
endif
--
2.35.1.693.g805e0a68082a
