2001-02-02 Phil Edwards <pme@sources.redhat.com>

	* mkcheck.in:  Also limit virtual memory size, for mmap-based mallocs.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39416 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 95133dd..2ada3b8 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-02  Phil Edwards  <pme@sources.redhat.com>
+
+       * mkcheck.in:  Also limit virtual memory size, for mmap-based mallocs.
+
 2001-02-01  Alexandre Oliva  <aoliva@redhat.com>
 
        * configure.in (toplevel_srcdir, auxdir): Set.

diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index 7eb30e0..d97289e 100755 (executable)
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -89,9 +89,9 @@ LOG_FILE="$TEST_DIR/$(date +%Y%m%d)-mkchecklog.txt"
 # the names of the specific test files to be run
 TESTS_FILE="$TEST_DIR/$(date +%Y%m%d)-mkcheckfiles.txt"
 
-# the heap size limit for testsuite binaries; start with a 2MB limit as per
-# http://gcc.gnu.org/ml/libstdc++/2000-10/msg00029.html
-MAX_MEM_USAGE=3072
+# the heap size and virtual mem limit for testsuite binaries
+# See http://gcc.gnu.org/ml/libstdc++/2000-10/msg00029.html
+MAX_MEM_USAGE=16384
 
 #
 # 2: clean, make files, append general test info
@@ -338,7 +338,8 @@ test_file()
         # printed by the executable will be lost and cannot be redirected,
         # because we need to capture the output of 'time'.  Bummer.
         TIMEFORMAT='timemark %R'
-        E_TIME_TEXT="$(exec 2>&1; ulimit -d $MAX_MEM_USAGE; \
+        E_TIME_TEXT="$(exec 2>&1;                                        \
+                     ulimit -d $MAX_MEM_USAGE; ulimit -v $MAX_MEM_USAGE; \
                      time $LTEXE $EXENAME)"
         E_ABNORMAL_TERMINATION=$?
         E_TIME="$(echo $E_TIME_TEXT | awk '{print $2}')"