summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan <mail@3v1n0.net>2023-05-09 12:49:54 +0000
committerMarco Trevisan <mail@3v1n0.net>2023-05-09 12:49:54 +0000
commit061881afbad140a2db94e892a82281078d017617 (patch)
treeda1fa92abd3e9e8c8926445befa777dbac9cd48f
parent1461c29301e95042268abca0c6e315d27500b948 (diff)
parent85af9b73c9ad0bbeac0f5151f86411dcf89221a6 (diff)
downloadglib-061881afbad140a2db94e892a82281078d017617.tar.gz
Merge branch 'aborting-tests-rlimit' into 'main'
tests: Zero the rlimit in standalone tests which are expected to abort Closes #2939 See merge request GNOME/glib!3417
-rw-r--r--glib/tests/assert-msg-test.c38
-rw-r--r--glib/tests/messages-low-memory.c9
2 files changed, 44 insertions, 3 deletions
diff --git a/glib/tests/assert-msg-test.c b/glib/tests/assert-msg-test.c
index 75591c853..b46496635 100644
--- a/glib/tests/assert-msg-test.c
+++ b/glib/tests/assert-msg-test.c
@@ -1,7 +1,39 @@
+/* GLib testing framework examples and tests
+ *
+ * Copyright © 2009 Canonical Limited
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * 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/>.
+ */
+
+#include "config.h"
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
#include <glib.h>
-int main(int argc, char **argv)
+int
+main (int argc,
+ char **argv)
{
- g_assert(42 < 0);
- return 0;
+#ifdef HAVE_SYS_RESOURCE_H
+ /* We expect this test to abort, so try to avoid that creating a coredump */
+ struct rlimit limit = { 0, 0 };
+ (void) setrlimit (RLIMIT_CORE, &limit);
+#endif
+
+ g_assert (42 < 0);
+ return 0;
}
diff --git a/glib/tests/messages-low-memory.c b/glib/tests/messages-low-memory.c
index af35c4e26..ecb507024 100644
--- a/glib/tests/messages-low-memory.c
+++ b/glib/tests/messages-low-memory.c
@@ -23,6 +23,9 @@
#include "config.h"
#include <dlfcn.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
#include <glib.h>
static gboolean malloc_eom = FALSE;
@@ -56,6 +59,12 @@ int
main (int argc,
char *argv[])
{
+#ifdef HAVE_SYS_RESOURCE_H
+ /* We expect this test to abort, so try to avoid that creating a coredump */
+ struct rlimit limit = { 0, 0 };
+ (void) setrlimit (RLIMIT_CORE, &limit);
+#endif
+
g_setenv ("LC_ALL", "C", TRUE);
#ifndef ENOMEM