aboutsummaryrefslogtreecommitdiff
path: root/tests/ptimer-test.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-01-13 13:06:49 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-01-13 13:06:49 +0000
commit981c9b88e674408a1579ca3aa8d42770e3b689de (patch)
treef08bbcff5d0f240f057b5eedbbd200040f420902 /tests/ptimer-test.c
parentabd5f8bb9525d3ad6cdced2c9208ee0cf445d9e1 (diff)
parent22108f333d16cbfbd5808bb4f661c394b08fe698 (diff)
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-01-12' into staging
* Move qtests into a separate directory * Build index.html for docs # gpg: Signature made Sun 12 Jan 2020 11:21:41 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2020-01-12: docs: build an index page for the HTML docs tests/libqos: Move the libqos files under tests/qtest/ tests/Makefile: Move qtest-related settings to a separate Makefile.include test: Move qtests to a separate directory tests/Makefile: Separate unit test dependencies from qtest dependencies tests/Makefile: Remove 'tests/' and '$(EXESUF)' from the check-qtest variables tests/ptimer: Remove unnecessary inclusion of libqtest.h tests/Makefile: test-char does not need libqtest Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/ptimer-test.c')
-rw-r--r--tests/ptimer-test.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c
index e16c30ce57..9176b96c1c 100644
--- a/tests/ptimer-test.c
+++ b/tests/ptimer-test.c
@@ -14,7 +14,6 @@
#include "qemu/main-loop.h"
#include "hw/ptimer.h"
-#include "libqtest.h"
#include "ptimer-test.h"
static bool triggered;