From e49c56d66ef16e38bf6f18436157ca278125b2c6 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 2 Nov 2021 11:06:33 +0100 Subject: [PATCH] tests: include config.h Signed-off-by: Christian Brauner --- src/tests/aa.c | 2 ++ src/tests/api_reboot.c | 2 ++ src/tests/arch_parse.c | 2 ++ src/tests/attach.c | 2 ++ src/tests/basic.c | 2 ++ src/tests/cgpath.c | 3 +++ src/tests/clonetest.c | 3 +++ src/tests/concurrent.c | 3 ++- src/tests/config_jump_table.c | 3 +++ src/tests/console.c | 2 ++ src/tests/console_log.c | 3 ++- src/tests/containertests.c | 3 +++ src/tests/createtest.c | 3 +++ src/tests/criu_check_feature.c | 2 ++ src/tests/cve-2019-5736.c | 5 ++--- src/tests/destroytest.c | 3 +++ src/tests/device_add_remove.c | 2 ++ src/tests/fuzz-lxc-cgroup-init.c | 2 ++ src/tests/fuzz-lxc-config-read.c | 2 ++ src/tests/fuzz-lxc-define-load.c | 2 ++ src/tests/get_item.c | 3 +++ src/tests/getkeys.c | 2 ++ src/tests/list.c | 2 ++ src/tests/locktests.c | 3 +++ src/tests/lxc-test-utils.c | 4 ++-- src/tests/lxc_raw_clone.c | 4 ++-- src/tests/lxcpath.c | 3 +++ src/tests/lxctest.h | 2 ++ src/tests/may_control.c | 2 ++ src/tests/mount_injection.c | 1 + src/tests/parse_config_file.c | 3 +++ src/tests/reboot.c | 3 +++ src/tests/rootfs_options.c | 2 -- src/tests/saveconfig.c | 3 +++ src/tests/share_ns.c | 3 ++- src/tests/shortlived.c | 3 +++ src/tests/shutdowntest.c | 3 +++ src/tests/snapshot.c | 3 +++ src/tests/startone.c | 3 +++ src/tests/state_server.c | 2 ++ src/tests/sys_mixed.c | 2 -- 41 files changed, 93 insertions(+), 14 deletions(-) diff --git a/src/tests/aa.c b/src/tests/aa.c index 69808b6f3..e288b46df 100644 --- a/src/tests/aa.c +++ b/src/tests/aa.c @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + /* Test apparmor rules */ #include #include "lxc/utils.h" diff --git a/src/tests/api_reboot.c b/src/tests/api_reboot.c index af12d6237..2ab6872ad 100644 --- a/src/tests/api_reboot.c +++ b/src/tests/api_reboot.c @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/arch_parse.c b/src/tests/arch_parse.c index 38ec972d3..6d72d664d 100644 --- a/src/tests/arch_parse.c +++ b/src/tests/arch_parse.c @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/attach.c b/src/tests/attach.c index 45c93390b..b695df35b 100644 --- a/src/tests/attach.c +++ b/src/tests/attach.c @@ -19,6 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/basic.c b/src/tests/basic.c index 4e7a05fe9..a691ca751 100644 --- a/src/tests/basic.c +++ b/src/tests/basic.c @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c index 46ae0259d..aff10b46d 100644 --- a/src/tests/cgpath.c +++ b/src/tests/cgpath.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c index f3a8e5b0b..00e81fe1a 100644 --- a/src/tests/clonetest.c +++ b/src/tests/clonetest.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/concurrent.c b/src/tests/concurrent.c index 87d2ae978..83ef393f4 100644 --- a/src/tests/concurrent.c +++ b/src/tests/concurrent.c @@ -16,7 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#include "config.h" + #include #include #include diff --git a/src/tests/config_jump_table.c b/src/tests/config_jump_table.c index 3f08fb942..a0b966b3c 100644 --- a/src/tests/config_jump_table.c +++ b/src/tests/config_jump_table.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/console.c b/src/tests/console.c index 9acd69474..f34c96bf5 100644 --- a/src/tests/console.c +++ b/src/tests/console.c @@ -19,6 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include diff --git a/src/tests/console_log.c b/src/tests/console_log.c index f0e31c9d5..77ca87deb 100644 --- a/src/tests/console_log.c +++ b/src/tests/console_log.c @@ -16,7 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define __STDC_FORMAT_MACROS +#include "config.h" + #include #include #include diff --git a/src/tests/containertests.c b/src/tests/containertests.c index 0fb6fbdfb..7bd5e92ef 100644 --- a/src/tests/containertests.c +++ b/src/tests/containertests.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/createtest.c b/src/tests/createtest.c index 53db119be..f7ce78ba9 100644 --- a/src/tests/createtest.c +++ b/src/tests/createtest.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/criu_check_feature.c b/src/tests/criu_check_feature.c index 6ae4b1d40..c1b19c35b 100644 --- a/src/tests/criu_check_feature.c +++ b/src/tests/criu_check_feature.c @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include diff --git a/src/tests/cve-2019-5736.c b/src/tests/cve-2019-5736.c index 99e425bb0..c0cb4bc41 100644 --- a/src/tests/cve-2019-5736.c +++ b/src/tests/cve-2019-5736.c @@ -17,9 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE 1 -#endif +#include "config.h" + #include #include #include diff --git a/src/tests/destroytest.c b/src/tests/destroytest.c index 79549120e..591a52b3b 100644 --- a/src/tests/destroytest.c +++ b/src/tests/destroytest.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/device_add_remove.c b/src/tests/device_add_remove.c index eb146090f..da6f53654 100644 --- a/src/tests/device_add_remove.c +++ b/src/tests/device_add_remove.c @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/fuzz-lxc-cgroup-init.c b/src/tests/fuzz-lxc-cgroup-init.c index 4e4053229..ab3087ef5 100644 --- a/src/tests/fuzz-lxc-cgroup-init.c +++ b/src/tests/fuzz-lxc-cgroup-init.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ +#include "config.h" + #include #include diff --git a/src/tests/fuzz-lxc-config-read.c b/src/tests/fuzz-lxc-config-read.c index ab5aa601c..41c5d533e 100644 --- a/src/tests/fuzz-lxc-config-read.c +++ b/src/tests/fuzz-lxc-config-read.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ +#include "config.h" + #include #include diff --git a/src/tests/fuzz-lxc-define-load.c b/src/tests/fuzz-lxc-define-load.c index 3f05b15c7..5a39fc949 100644 --- a/src/tests/fuzz-lxc-define-load.c +++ b/src/tests/fuzz-lxc-define-load.c @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ +#include "config.h" + #include #include diff --git a/src/tests/get_item.c b/src/tests/get_item.c index e5836f350..f30478168 100644 --- a/src/tests/get_item.c +++ b/src/tests/get_item.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c index c9e240dfd..4768b9ebd 100644 --- a/src/tests/getkeys.c +++ b/src/tests/getkeys.c @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/list.c b/src/tests/list.c index 293835756..7ba2cb002 100644 --- a/src/tests/list.c +++ b/src/tests/list.c @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/locktests.c b/src/tests/locktests.c index 74cd48541..4836d46df 100644 --- a/src/tests/locktests.c +++ b/src/tests/locktests.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include "lxc/lxclock.h" #include "config.h" #include diff --git a/src/tests/lxc-test-utils.c b/src/tests/lxc-test-utils.c index 96d23f35c..f10c1eba8 100644 --- a/src/tests/lxc-test-utils.c +++ b/src/tests/lxc-test-utils.c @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define _GNU_SOURCE -#define __STDC_FORMAT_MACROS +#include "config.h" + #include #include #include diff --git a/src/tests/lxc_raw_clone.c b/src/tests/lxc_raw_clone.c index 6b845b640..1225d023d 100644 --- a/src/tests/lxc_raw_clone.c +++ b/src/tests/lxc_raw_clone.c @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define _GNU_SOURCE -#define __STDC_FORMAT_MACROS +#include "config.h" + #include #include #include diff --git a/src/tests/lxcpath.c b/src/tests/lxcpath.c index b5f858895..9e87d6875 100644 --- a/src/tests/lxcpath.c +++ b/src/tests/lxcpath.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/lxctest.h b/src/tests/lxctest.h index 506168bfb..e63936d5f 100644 --- a/src/tests/lxctest.h +++ b/src/tests/lxctest.h @@ -24,6 +24,8 @@ #ifndef __LXC_TEST_H_ #define __LXC_TEST_H_ +#include "config.h" + #include #include #include diff --git a/src/tests/may_control.c b/src/tests/may_control.c index 88437140d..cb5378cad 100644 --- a/src/tests/may_control.c +++ b/src/tests/may_control.c @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/mount_injection.c b/src/tests/mount_injection.c index c05455880..64b1cb253 100644 --- a/src/tests/mount_injection.c +++ b/src/tests/mount_injection.c @@ -16,6 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include #include diff --git a/src/tests/parse_config_file.c b/src/tests/parse_config_file.c index d19e24ec9..990ce7256 100644 --- a/src/tests/parse_config_file.c +++ b/src/tests/parse_config_file.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/reboot.c b/src/tests/reboot.c index 9e9db2277..e16aabe2c 100644 --- a/src/tests/reboot.c +++ b/src/tests/reboot.c @@ -16,6 +16,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config.h" + #include #include #include diff --git a/src/tests/rootfs_options.c b/src/tests/rootfs_options.c index 05cb3dda6..55f86ab3d 100644 --- a/src/tests/rootfs_options.c +++ b/src/tests/rootfs_options.c @@ -18,8 +18,6 @@ #include "config.h" -#define __STDC_FORMAT_MACROS - #include #include #include diff --git a/src/tests/saveconfig.c b/src/tests/saveconfig.c index c73240223..41ca66224 100644 --- a/src/tests/saveconfig.c +++ b/src/tests/saveconfig.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/share_ns.c b/src/tests/share_ns.c index 305f5cca4..c46023f01 100644 --- a/src/tests/share_ns.c +++ b/src/tests/share_ns.c @@ -16,7 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#include "config.h" + #include #include #include diff --git a/src/tests/shortlived.c b/src/tests/shortlived.c index 7c723ead2..f4a742f6d 100644 --- a/src/tests/shortlived.c +++ b/src/tests/shortlived.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c index cec6efc7b..89e7c447f 100644 --- a/src/tests/shutdowntest.c +++ b/src/tests/shutdowntest.c @@ -17,6 +17,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/snapshot.c b/src/tests/snapshot.c index e62230bc2..62440fe28 100644 --- a/src/tests/snapshot.c +++ b/src/tests/snapshot.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/startone.c b/src/tests/startone.c index de9af07f8..5d5a23f4b 100644 --- a/src/tests/startone.c +++ b/src/tests/startone.c @@ -16,6 +16,9 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" + #include #include diff --git a/src/tests/state_server.c b/src/tests/state_server.c index 3002888ed..cf6fcc47c 100644 --- a/src/tests/state_server.c +++ b/src/tests/state_server.c @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + #include #include #include diff --git a/src/tests/sys_mixed.c b/src/tests/sys_mixed.c index 9716ac3d0..b51f28c32 100644 --- a/src/tests/sys_mixed.c +++ b/src/tests/sys_mixed.c @@ -18,8 +18,6 @@ #include "config.h" -#define __STDC_FORMAT_MACROS - #include #include #include -- 2.39.2