summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChristian Hergert <chergert@redhat.com>2023-03-16 16:38:48 -0700
committerChristian Hergert <chergert@redhat.com>2023-03-22 16:44:35 -0700
commit46cf665494b7602b2aed8cb156415236f828e112 (patch)
treec95de26d0736eced826dda37e2c3b161b531b081 /tests
parent35e70f0b4581276955cc9caa5088afea1a9d6ca6 (diff)
downloadlibpeas-46cf665494b7602b2aed8cb156415236f828e112.tar.gz
janitorial: remove HAVE_CONFIG_H
There is no need to do the HAVE_CONFIG_H thing with meson. We always have a config.h so just include it unconditionally.
Diffstat (limited to 'tests')
-rw-r--r--tests/libpeas/engine.c4
-rw-r--r--tests/libpeas/extension-c.c4
-rw-r--r--tests/libpeas/extension-lua.c6
-rw-r--r--tests/libpeas/extension-py.c6
-rw-r--r--tests/libpeas/extension-set.c4
-rw-r--r--tests/libpeas/introspection/introspection-abstract.c4
-rw-r--r--tests/libpeas/introspection/introspection-base.c4
-rw-r--r--tests/libpeas/introspection/introspection-callable.c4
-rw-r--r--tests/libpeas/introspection/introspection-has-prerequisite.c4
-rw-r--r--tests/libpeas/introspection/introspection-prerequisite.c4
-rw-r--r--tests/libpeas/introspection/introspection-unimplemented.c4
-rw-r--r--tests/libpeas/introspection/meson.build1
-rw-r--r--tests/libpeas/plugin-info.c4
-rw-r--r--tests/libpeas/plugins/embedded/embedded-plugin.c4
-rw-r--r--tests/libpeas/plugins/extension-c/extension-c-abstract.c4
-rw-r--r--tests/libpeas/plugins/extension-c/extension-c-plugin.c4
-rw-r--r--tests/libpeas/testing/meson.build1
-rw-r--r--tests/libpeas/testing/testing-extension.c4
-rw-r--r--tests/libpeas/testing/testing.c4
-rw-r--r--tests/plugins/builtin/builtin-plugin.c4
-rw-r--r--tests/plugins/has-dep/has-dep-plugin.c4
-rw-r--r--tests/plugins/loadable/loadable-plugin.c4
-rw-r--r--tests/plugins/self-dep/self-dep-plugin.c4
-rw-r--r--tests/testing-util/meson.build1
24 files changed, 23 insertions, 68 deletions
diff --git a/tests/libpeas/engine.c b/tests/libpeas/engine.c
index 5a81d87..6eb3db2 100644
--- a/tests/libpeas/engine.c
+++ b/tests/libpeas/engine.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdlib.h>
#include <glib.h>
diff --git a/tests/libpeas/extension-c.c b/tests/libpeas/extension-c.c
index cdd7f76..69438f4 100644
--- a/tests/libpeas/extension-c.c
+++ b/tests/libpeas/extension-c.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "libpeas.h"
#include "peas-plugin-info-priv.h"
diff --git a/tests/libpeas/extension-lua.c b/tests/libpeas/extension-lua.c
index 0a0b541..b5a21dd 100644
--- a/tests/libpeas/extension-lua.c
+++ b/tests/libpeas/extension-lua.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <lua.h>
#include <lauxlib.h>
@@ -179,7 +177,7 @@ main (int argc,
#undef EXTENSION_TEST
#undef EXTENSION_TEST_FUNC
-
+
#define EXTENSION_TEST(loader, path, func) \
testing_extension_add (EXTENSION_TEST_NAME (loader, path), \
(gpointer) test_extension_lua_##func)
diff --git a/tests/libpeas/extension-py.c b/tests/libpeas/extension-py.c
index f71c14a..7adb7b9 100644
--- a/tests/libpeas/extension-py.c
+++ b/tests/libpeas/extension-py.c
@@ -22,9 +22,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <pygobject.h>
@@ -237,7 +235,7 @@ main (int argc,
#undef EXTENSION_TEST
#undef EXTENSION_TEST_FUNC
-
+
#define EXTENSION_TEST(loader, path, func) \
testing_extension_add (EXTENSION_TEST_NAME (loader, path), \
(gpointer) test_extension_py_##func)
diff --git a/tests/libpeas/extension-set.c b/tests/libpeas/extension-set.c
index ba8942f..313da01 100644
--- a/tests/libpeas/extension-set.c
+++ b/tests/libpeas/extension-set.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdlib.h>
diff --git a/tests/libpeas/introspection/introspection-abstract.c b/tests/libpeas/introspection/introspection-abstract.c
index a3754f8..73bd4cb 100644
--- a/tests/libpeas/introspection/introspection-abstract.c
+++ b/tests/libpeas/introspection/introspection-abstract.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "introspection-abstract.h"
diff --git a/tests/libpeas/introspection/introspection-base.c b/tests/libpeas/introspection/introspection-base.c
index f49a6b3..89cb4a9 100644
--- a/tests/libpeas/introspection/introspection-base.c
+++ b/tests/libpeas/introspection/introspection-base.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "introspection-base.h"
diff --git a/tests/libpeas/introspection/introspection-callable.c b/tests/libpeas/introspection/introspection-callable.c
index 855a95e..0fdd18f 100644
--- a/tests/libpeas/introspection/introspection-callable.c
+++ b/tests/libpeas/introspection/introspection-callable.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "introspection-callable.h"
diff --git a/tests/libpeas/introspection/introspection-has-prerequisite.c b/tests/libpeas/introspection/introspection-has-prerequisite.c
index fb53160..5ea5f7a 100644
--- a/tests/libpeas/introspection/introspection-has-prerequisite.c
+++ b/tests/libpeas/introspection/introspection-has-prerequisite.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "introspection-base.h"
#include "introspection-callable.h"
diff --git a/tests/libpeas/introspection/introspection-prerequisite.c b/tests/libpeas/introspection/introspection-prerequisite.c
index 8520d30..1e3ef57 100644
--- a/tests/libpeas/introspection/introspection-prerequisite.c
+++ b/tests/libpeas/introspection/introspection-prerequisite.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "introspection-prerequisite.h"
diff --git a/tests/libpeas/introspection/introspection-unimplemented.c b/tests/libpeas/introspection/introspection-unimplemented.c
index eafb007..fb08465 100644
--- a/tests/libpeas/introspection/introspection-unimplemented.c
+++ b/tests/libpeas/introspection/introspection-unimplemented.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include "introspection-unimplemented.h"
diff --git a/tests/libpeas/introspection/meson.build b/tests/libpeas/introspection/meson.build
index cb7a229..f2e3853 100644
--- a/tests/libpeas/introspection/meson.build
+++ b/tests/libpeas/introspection/meson.build
@@ -26,7 +26,6 @@ libintrospection_deps = [
]
libintrospection_c_args = [
- '-DHAVE_CONFIG_H',
]
libintrospection_lib = library(
diff --git a/tests/libpeas/plugin-info.c b/tests/libpeas/plugin-info.c
index 369ec79..65c4688 100644
--- a/tests/libpeas/plugin-info.c
+++ b/tests/libpeas/plugin-info.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdlib.h>
diff --git a/tests/libpeas/plugins/embedded/embedded-plugin.c b/tests/libpeas/plugins/embedded/embedded-plugin.c
index 4fc876f..747b2c5 100644
--- a/tests/libpeas/plugins/embedded/embedded-plugin.c
+++ b/tests/libpeas/plugins/embedded/embedded-plugin.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib-object.h>
diff --git a/tests/libpeas/plugins/extension-c/extension-c-abstract.c b/tests/libpeas/plugins/extension-c/extension-c-abstract.c
index 1a64dc8..e074ce1 100644
--- a/tests/libpeas/plugins/extension-c/extension-c-abstract.c
+++ b/tests/libpeas/plugins/extension-c/extension-c-abstract.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib-object.h>
diff --git a/tests/libpeas/plugins/extension-c/extension-c-plugin.c b/tests/libpeas/plugins/extension-c/extension-c-plugin.c
index b0225f1..758c3de 100644
--- a/tests/libpeas/plugins/extension-c/extension-c-plugin.c
+++ b/tests/libpeas/plugins/extension-c/extension-c-plugin.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
index 74ba7b1..9278747 100644
--- a/tests/libpeas/testing/meson.build
+++ b/tests/libpeas/testing/meson.build
@@ -20,7 +20,6 @@ libpeas_testing_deps = [
]
libpeas_testing_c_args = [
- '-DHAVE_CONFIG_H',
'-DBUILDDIR="@0@"'.format(builddir),
'-DSRCDIR="@0@"'.format(srcdir),
]
diff --git a/tests/libpeas/testing/testing-extension.c b/tests/libpeas/testing/testing-extension.c
index 59b736a..9df6457 100644
--- a/tests/libpeas/testing/testing-extension.c
+++ b/tests/libpeas/testing/testing-extension.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/tests/libpeas/testing/testing.c b/tests/libpeas/testing/testing.c
index 75748fe..083b8a2 100644
--- a/tests/libpeas/testing/testing.c
+++ b/tests/libpeas/testing/testing.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdlib.h>
diff --git a/tests/plugins/builtin/builtin-plugin.c b/tests/plugins/builtin/builtin-plugin.c
index 3e66c86..9533433 100644
--- a/tests/plugins/builtin/builtin-plugin.c
+++ b/tests/plugins/builtin/builtin-plugin.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/plugins/has-dep/has-dep-plugin.c b/tests/plugins/has-dep/has-dep-plugin.c
index 61829a7..57cb237 100644
--- a/tests/plugins/has-dep/has-dep-plugin.c
+++ b/tests/plugins/has-dep/has-dep-plugin.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/plugins/loadable/loadable-plugin.c b/tests/plugins/loadable/loadable-plugin.c
index 0ecc0bb..f279407 100644
--- a/tests/plugins/loadable/loadable-plugin.c
+++ b/tests/plugins/loadable/loadable-plugin.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/plugins/self-dep/self-dep-plugin.c b/tests/plugins/self-dep/self-dep-plugin.c
index 02f9b6a..45d5f4d 100644
--- a/tests/plugins/self-dep/self-dep-plugin.c
+++ b/tests/plugins/self-dep/self-dep-plugin.c
@@ -21,9 +21,7 @@
* SPDX-License-Identifier: LGPL-2.1-or-later
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
index 34fd221..521337d 100644
--- a/tests/testing-util/meson.build
+++ b/tests/testing-util/meson.build
@@ -18,7 +18,6 @@ libtesting_util_deps = [
]
libtesting_util_c_args = [
- '-DHAVE_CONFIG_H',
'-DBUILDDIR="@0@"'.format(builddir),
'-DSRCDIR="@0@"'.format(srcdir),
'-UG_DISABLE_ASSERT',