提交 cfdc0c77 编写于 作者: M Michal Privoznik

Forget last daemon/ dir artefacts

The most important part is LIBVIRTD_PATH env var fix. It is used
in virFileFindResourceFull() from tests. The libvirtd no longer
lives under daemon/.

Then, libvirtd-fail test was still failing (as expected) but not
because of missing config file but because it was trying to
execute (nonexistent) top_builddir/daemon/libvirtd which
fulfilled expected outcome and thus test did not fail.

Thirdly, lcov was told to generate coverage for daemon/ dir too.

Fourthly, our compiling documentation was still suggesting to run
daemonn/libvirtd.

And finally, some comments in a systemtap file and a probes file
were still referring to daemon/libvirtd.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 1f1e1e0d
...@@ -80,7 +80,7 @@ check-access: ...@@ -80,7 +80,7 @@ check-access:
cov: clean-cov cov: clean-cov
$(MKDIR_P) $(top_builddir)/coverage $(MKDIR_P) $(top_builddir)/coverage
$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-d $(top_builddir)/src -d $(top_builddir)/daemon \ -d $(top_builddir)/src \
-d $(top_builddir)/tests -d $(top_builddir)/tests
$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \ $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
-o $(top_builddir)/coverage/libvirt.info -o $(top_builddir)/coverage/libvirt.info
......
...@@ -125,7 +125,7 @@ $ make ...@@ -125,7 +125,7 @@ $ make
<pre> <pre>
$ su - $ su -
# service libvirtd stop (or systemctl stop libvirtd.service) # service libvirtd stop (or systemctl stop libvirtd.service)
# /home/to/your/checkout/daemon/libvirtd # /home/to/your/checkout/src/libvirtd
</pre> </pre>
<p> <p>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# Document usage with uninstalled daemon and libs. Assuming CWD is toplevel # Document usage with uninstalled daemon and libs. Assuming CWD is toplevel
# source git directory, it should be only slight modification to the following: # source git directory, it should be only slight modification to the following:
# #
# ./run stap --ldd -c daemon/libvirtd -d daemon/libvirtd # ./run stap --ldd -c src/libvirtd -d src/libvirtd
# examples/systemtap/lock-debug.stp src/.libs/libvirt.so # examples/systemtap/lock-debug.stp src/.libs/libvirt.so
# #
# Debug RWLock mechanisms as well. # Debug RWLock mechanisms as well.
......
...@@ -52,7 +52,7 @@ provider libvirt { ...@@ -52,7 +52,7 @@ provider libvirt {
probe rpc_client_msg_rx(void *client, int len, int prog, int vers, int proc, int type, int status, int serial); probe rpc_client_msg_rx(void *client, int len, int prog, int vers, int proc, int type, int status, int serial);
# file: daemon/libvirtd.c # file: src/remote/remote_daemon.c
# prefix: rpc # prefix: rpc
probe rpc_server_client_auth_allow(void *client, int authtype, const char *identity); probe rpc_server_client_auth_allow(void *client, int authtype, const char *identity);
probe rpc_server_client_auth_deny(void *client, int authtype, const char *identity); probe rpc_server_client_auth_deny(void *client, int authtype, const char *identity);
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
if test "$VERBOSE" = yes; then if test "$VERBOSE" = yes; then
set -x set -x
$abs_top_builddir/daemon/libvirtd --version $abs_top_builddir/src/libvirtd --version
fi fi
fail=0 fail=0
$abs_top_builddir/daemon/libvirtd --config=no-such-conf --timeout=5 2> log $abs_top_builddir/src/libvirtd --config=no-such-conf --timeout=5 2> log
RET=$? RET=$?
test "$RET" != "0" && exit 0 || exit 1 test "$RET" != "0" && exit 0 || exit 1
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册