aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Edwards <pme@gcc.gnu.org>2001-02-02 20:32:35 +0000
committerPhil Edwards <pme@gcc.gnu.org>2001-02-02 20:32:35 +0000
commit2bf9b27db7a7f87373a7a702e6741bdaf820ddbd (patch)
tree5ca55c410b53a0e8d356497f005400cce4b915e7
parent362f22957ffba0fb5828714de69881fd4ad9ef3b (diff)
downloadgcc-2bf9b27db7a7f87373a7a702e6741bdaf820ddbd.zip
gcc-2bf9b27db7a7f87373a7a702e6741bdaf820ddbd.tar.gz
gcc-2bf9b27db7a7f87373a7a702e6741bdaf820ddbd.tar.bz2
mkcheck.in: Also limit virtual memory size, for mmap-based mallocs.
2001-02-02 Phil Edwards <pme@sources.redhat.com> * mkcheck.in: Also limit virtual memory size, for mmap-based mallocs. From-SVN: r39416
-rw-r--r--libstdc++-v3/ChangeLog4
-rwxr-xr-xlibstdc++-v3/mkcheck.in9
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 95133dd..2ada3b8 100644
--- 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
--- 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}')"