The test did fail when the virtual memory already had a hard limit !=
unlimited.

Committed as r12-57-gfaf7d413a3f3337be1a3ac5cdf33e0e3b87b426e

Tobias

-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 München 
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Frank 
Thürauf
commit faf7d413a3f3337be1a3ac5cdf33e0e3b87b426e
Author: Tobias Burnus <tob...@codesourcery.com>
Date:   Thu Apr 22 11:05:17 2021 +0200

    gfortran.dg/pr68078.f90: Avoid increasing RLIMIT_AS
    
    pr68078.f90 tests out-of-memory handling and calls set_vm_limit to set the
    soft limit.  However, setrlimit was then called with hard limit RLIM_INFINITY,
    which failed when the current hard limit was lower.
    
    gcc/testsuite/
            * gfortran.dg/set_vm_limit.c (set_vm_limit): Call getrlimit, use
            obtained hard limit, and only call setrlimit if new softlimit is lower.

diff --git a/gcc/testsuite/gfortran.dg/set_vm_limit.c b/gcc/testsuite/gfortran.dg/set_vm_limit.c
index 30c4b43e0ed..8344f6fd079 100644
--- a/gcc/testsuite/gfortran.dg/set_vm_limit.c
+++ b/gcc/testsuite/gfortran.dg/set_vm_limit.c
@@ -8,9 +8,20 @@
 void
 set_vm_limit (int vm_limit)
 {
-  struct rlimit rl = { vm_limit, RLIM_INFINITY };
+  struct rlimit rl;
   int r;
 
+  r = getrlimit (RLIMIT_AS, &rl);
+  if (r)
+    {
+      perror ("get_vm_limit");
+      exit (1);
+    }
+
+  if (vm_limit >= rl.rlim_cur)
+    return;
+
+  rl.rlim_cur = vm_limit;
   r = setrlimit (RLIMIT_AS, &rl);
   if (r)
     {

Reply via email to