Introduce vircommandpriv.h for functions used by tests

So far it's just virCommandSetDryRun.

diff --git a/src/Makefile.am b/src/Makefile.am
index a88b258b7291ad7531ec91ddb48d937c80193b93..25b33a7f03400f16574148a752d8b5e13262f7de 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,7 +91,7 @@ UTIL_SOURCES =                                                        \
                util/virbuffer.c util/virbuffer.h               \
                util/vircgroup.c util/vircgroup.h util/vircgrouppriv.h  \
                util/virclosecallbacks.c util/virclosecallbacks.h               \
-               util/vircommand.c util/vircommand.h             \
+               util/vircommand.c util/vircommand.h util/vircommandpriv.h \
                util/virconf.c util/virconf.h                   \
                util/vircrypto.c util/vircrypto.h               \
                util/virdbus.c util/virdbus.h util/virdbuspriv.h        \

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index db4166f521744cae9af36c93cf1919d8bec15763..fd7b7138076f5b4c45e5f9dbbae0afcbd8ce7003 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -40,7 +40,8 @@
 # include <sys/apparmor.h>
 #endif
 
-#include "vircommand.h"
+#define __VIR_COMMAND_PRIV_H_ALLOW__
+#include "vircommandpriv.h"
 #include "viralloc.h"
 #include "virerror.h"
 #include "virutil.h"

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 7485edcaeb32e693b13a5c88b76f2d624fd81bb1..10b4fa22a4ce4583ec70869f696ce0f1e59c06f6 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -186,6 +186,4 @@ void virCommandAbort(virCommandPtr cmd);
 void virCommandFree(virCommandPtr cmd);
 
 void virCommandDoAsyncIO(virCommandPtr cmd);
-
-void virCommandSetDryRun(virBufferPtr buf);
 #endif /* __VIR_COMMAND_H__ */

diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h
new file mode 100644 (file)
index 0000000..80247b2
--- /dev/null
+++ b/src/util/vircommandpriv.h
@@ -0,0 +1,32 @@
+/*
+ * vircommandpriv.h: Functions for testing virCommand APIs
+ *
+ * Copyright (C) 2014 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef __VIR_COMMAND_PRIV_H_ALLOW__
+# error "vircommandpriv.h may only be included by vircommand.c or test suites"
+#endif
+
+#ifndef __VIR_COMMAND_PRIV_H__
+# define __VIR_COMMAND_PRIV_H__
+
+# include "vircommand.h"
+
+void virCommandSetDryRun(virBufferPtr buf);
+#endif /* __VIR_COMMAND_PRIV_H__ */

diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index c6f5a728a0bd62a48cac4f9e8602194904b21884..eaf1b75c783d9bc7a9b782e870ab714fcb2dbf94 100644 (file)
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -23,7 +23,8 @@
 #ifdef __linux__
 
 # include <stdlib.h>
-# include "vircommand.h"
+# define __VIR_COMMAND_PRIV_H_ALLOW__
+# include "vircommandpriv.h"
 # include "virkmod.h"
 # include "virstring.h"
 

diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
index 073fdf88b69b4b286bb643b9689c5f8bcba72703..38dfbc1ef60f957dbc079702524c2f289c8f4e12 100644 (file)
--- a/tests/virnetdevbandwidthtest.c
+++ b/tests/virnetdevbandwidthtest.c
@@ -21,7 +21,8 @@
 #include <config.h>
 
 #include "testutils.h"
-#include "vircommand.h"
+#define __VIR_COMMAND_PRIV_H_ALLOW__
+#include "vircommandpriv.h"
 #include "virnetdevbandwidth.h"
 #include "netdev_bandwidth_conf.c"