From b45dbf1124f105d110c67f9f5f958abf9a0b4c05 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 19 Oct 2001 23:05:15 +0000 Subject: 2001-10-19 Benjamin Kosnik * mkcheck.in (static_fail): Remove older memory limit functionality. Disable E_TIME due to formatting issues. * README: Update. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@46367 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/README | 34 ++++++++++------------------------ libstdc++-v3/mkcheck.in | 18 ++++++------------ 3 files changed, 23 insertions(+), 36 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5b17ebeadc7..f03e86ee29c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2001-10-19 Benjamin Kosnik + + * mkcheck.in (static_fail): Remove older memory limit functionality. + Disable E_TIME due to formatting issues. + + * README: Update. + 2001-10-19 Brendan Kehoe * include/bits/std_complex.h: Default initialize second argument diff --git a/libstdc++-v3/README b/libstdc++-v3/README index 473cf919a6f..3ace755fa0e 100644 --- a/libstdc++-v3/README +++ b/libstdc++-v3/README @@ -24,11 +24,7 @@ It has subdirectories: include/std Files meant to be found by #include directives in - standard-conforming user programs. These headers are not - referred to by other headers, because such dependencies - confuse Make (leading it to delete them, all too often). - Installations may substitute symbolic links in place of - these files. + standard-conforming user programs. include/ext Headers that define extensions to the standard library. No @@ -38,13 +34,6 @@ It has subdirectories: Headers provided for backward compatibility, such as . They are not used in this library. - include/c_shadow - Headers intended to shadow standard C headers provided by an - underlying OS or C library, and other headers depended on directly - by C++ headers (e.g. unistd.h). These are meant to wrap the names - defined there into the _C_legacy namespace. - [NB: this can be enabled via --enable-cheaders=c_shadow] - include/c Headers intended to directly include standard C headers. [NB: this can be enabled via --enable-cheaders=c] @@ -54,6 +43,13 @@ It has subdirectories: names into the std:: namespace. [NB: this is the default, and is the same as --enable-cheaders=c_std] + include/c_shadow + Headers intended to shadow standard C headers provided by an + underlying OS or C library, and other headers depended on directly + by C++ headers (e.g. unistd.h). These are meant to wrap the names + defined there into the _C_legacy namespace. + [NB: this can be enabled via --enable-cheaders=c_shadow] + src Files that are used in constructing the library, but are not installed. @@ -74,28 +70,18 @@ Currently these are: config/cpu config/os + config/io + config/locale Files needed only to construct the library, but not installed, are in src/. Files to be copied as part of an installation are all found in the subdirectories mentioned above. (A configure script may link files from another directory into one of these.) -In a normal installation the bits/ directory is copied -under the std/ directory, and arranged to be searched only -when an include directive specifies a filename of "bits/..." -or . When building the library, we use - - -I. -Iinclude/std -Iinclude -Iconfig/os/* -Iconfig/cpu/* - -to get the same effect. - Note that glibc also has a bits/ subdirectory. We will either need to be careful not to collide with names in its bits/ directory; or rename bits to (e.g.) cppbits/. -To install libstdc++ you need GNU make. The makefiles do not work with -any other make. - In files throughout the system, lines marked with an "XXX" indicate a bug or incompletely-implemented feature. Lines marked "XXX MT" indicate a place that may require attention for multi-thread safety. diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index 6d9ef1df914..c65a144c2c8 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -78,9 +78,6 @@ 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 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 @@ -339,18 +336,12 @@ 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; ulimit -v $MAX_MEM_USAGE; \ - time $LTEXE $EXENAME)" + E_TIME_TEXT="$(exec 2>&1; time $LTEXE $EXENAME)" E_ABNORMAL_TERMINATION=$? - E_TIME="$(echo $E_TIME_TEXT | awk '{print $2}')" - # joining those two commands does not work due to quoting problems: - #E_TIME="$(exec 2>&1; time $EXENAME | awk '{print $2}')" - # this will work as a fallback on certain systems...? - #E_TIME=$(exec 2>&1; time $EXENAME | cut -d ' ' -f 2) if [ "$E_ABNORMAL_TERMINATION" -ne 0 ]; then RESULT='-r' + E_TIME="0" rm -f ./*core # sometimes you want to save all core files for review: #mv ./core $EXENAME.core @@ -359,10 +350,13 @@ test_file() #mv ./core* $EXENAME.core else test_for_output + # XXX This doesn't always result in a number. + # E_TIME="$(echo $E_TIME_TEXT | awk '{print $2}')" + E_TIME="0" fi # sometimes you want to save all failing exe files for review: - if [ "$RESULT" = "+" ]; then + if [ "$RESULT" = '+' ]; then rm "$EXENAME" fi else -- cgit v1.2.3