[multiple changes]
2000-11-26 Benjamin Kosnik <bkoz@fillmore.constant.com> * tests_flags.in: Export CXX, CXXFLAGS. * mkcheck.in: Grab them. 2000-11-26 David Billinghurst <David.Billinghurst@riotinto.com> Benjamin Kosnik <bkoz@redhat.com> * mkcheck.in: Add exe extension to printnow executable, abstract out call to this with TIMER_COMMAND. * configure.target (l_glibcpp_cxxflags): Add cygwin support. * acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Correct paths. * aclocal.m4: Regenerate. * configure: Regenerate. From-SVN: r37780
This commit is contained in:
parent
e36b9711fb
commit
c383aafd3a
|
@ -1,3 +1,18 @@
|
||||||
|
2000-11-26 Benjamin Kosnik <bkoz@fillmore.constant.com>
|
||||||
|
|
||||||
|
* tests_flags.in: Export CXX, CXXFLAGS.
|
||||||
|
* mkcheck.in: Grab them.
|
||||||
|
|
||||||
|
2000-11-26 David Billinghurst <David.Billinghurst@riotinto.com>
|
||||||
|
Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
|
* mkcheck.in: Add exe extension to printnow executable, abstract
|
||||||
|
out call to this with TIMER_COMMAND.
|
||||||
|
* configure.target (l_glibcpp_cxxflags): Add cygwin support.
|
||||||
|
* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Correct paths.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2000-11-26 Benjamin Kosnik <bkoz@redhat.com>
|
2000-11-26 Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
* testsuite/27_io/istream_unformatted.cc (test05): Fixup.
|
* testsuite/27_io/istream_unformatted.cc (test05): Fixup.
|
||||||
|
|
|
@ -929,7 +929,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
|
||||||
ctype_newlib=yes, ctype_newlib=no)
|
ctype_newlib=yes, ctype_newlib=no)
|
||||||
AC_MSG_RESULT($ctype_newlib)
|
AC_MSG_RESULT($ctype_newlib)
|
||||||
if test $ctype_newlib = "yes"; then
|
if test $ctype_newlib = "yes"; then
|
||||||
ctype_include_dir="config/newlib"
|
ctype_include_dir="config/os/newlib"
|
||||||
ctype_default=no
|
ctype_default=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -941,7 +941,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
|
||||||
ctype_newlib=yes, ctype_newlib=no)
|
ctype_newlib=yes, ctype_newlib=no)
|
||||||
AC_MSG_RESULT($ctype_newlib)
|
AC_MSG_RESULT($ctype_newlib)
|
||||||
if test $ctype_newlib = "yes"; then
|
if test $ctype_newlib = "yes"; then
|
||||||
ctype_include_dir="config/newlib"
|
ctype_include_dir="config/os/newlib"
|
||||||
ctype_default=no
|
ctype_default=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -18081,7 +18081,7 @@ fi
|
||||||
rm -f conftest*
|
rm -f conftest*
|
||||||
echo "$ac_t""$ctype_newlib" 1>&6
|
echo "$ac_t""$ctype_newlib" 1>&6
|
||||||
if test $ctype_newlib = "yes"; then
|
if test $ctype_newlib = "yes"; then
|
||||||
ctype_include_dir="config/newlib"
|
ctype_include_dir="config/os/newlib"
|
||||||
ctype_default=no
|
ctype_default=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -84,6 +84,9 @@ case "${target_os}" in
|
||||||
bsd* | freebsd*)
|
bsd* | freebsd*)
|
||||||
os_include_dir="config/os/bsd"
|
os_include_dir="config/os/bsd"
|
||||||
;;
|
;;
|
||||||
|
cygwin*)
|
||||||
|
os_include_dir="config/os/newlib"
|
||||||
|
;;
|
||||||
linux*)
|
linux*)
|
||||||
os_include_dir="config/os/gnu-linux"
|
os_include_dir="config/os/gnu-linux"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -53,7 +53,7 @@ esac
|
||||||
saved_ifs=$IFS
|
saved_ifs=$IFS
|
||||||
IFS=':'
|
IFS=':'
|
||||||
set `./tests_flags ${query} $*` || exit 1
|
set `./tests_flags ${query} $*` || exit 1
|
||||||
BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; LTCXX=$4; LIBS=$5; LTEXE=$6;
|
BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; LTCXX=$4; LIBS=$5; LTEXE=$6; CXX=$7; CXXFLAGS=$8;
|
||||||
IFS=$saved_ifs
|
IFS=$saved_ifs
|
||||||
|
|
||||||
# Set up the testing directory, which should be in a directory called
|
# Set up the testing directory, which should be in a directory called
|
||||||
|
@ -82,6 +82,13 @@ MAX_MEM_USAGE=3072
|
||||||
#
|
#
|
||||||
# 2: clean, make files, append general test info
|
# 2: clean, make files, append general test info
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Remove old executables.
|
||||||
|
rm -rf "$TEST_DIR"/*exe
|
||||||
|
|
||||||
|
# Remove old core files (which now get left in cwd, not $TEST_DIR).
|
||||||
|
rm -rf ./*core*
|
||||||
|
|
||||||
if [ -f $RESULTS_FILE ]; then
|
if [ -f $RESULTS_FILE ]; then
|
||||||
rm $RESULTS_FILE
|
rm $RESULTS_FILE
|
||||||
fi
|
fi
|
||||||
|
@ -101,18 +108,13 @@ if [ ! -f "$TESTS_FILE" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Nasty solution to replace GNU date(1)'s %s time_t output function.
|
# Nasty solution to replace GNU date(1)'s %s time_t output function.
|
||||||
if [ ! -x "$TEST_DIR/printnow" ]; then
|
TIMER_COMMAND=$TEST_DIR/printnow.exe
|
||||||
echo "making utility $TEST_DIR/printnow"
|
if [ ! -x "$TIMER_COMMAND" ]; then
|
||||||
gcc -o "$TEST_DIR/printnow" "$SRC_DIR/testsuite/printnow.c"
|
echo "making utility $TIMER_COMMAND"
|
||||||
strip "$TEST_DIR/printnow"
|
gcc -o "$TIMER_COMMAND" "$SRC_DIR/testsuite/printnow.c"
|
||||||
|
strip "$TIMER_COMMAND"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove old executables.
|
|
||||||
rm -rf "$TEST_DIR"/*exe
|
|
||||||
|
|
||||||
# Remove old core files (which now get left in cwd, not $TEST_DIR).
|
|
||||||
rm -rf ./*core*
|
|
||||||
|
|
||||||
# Copy over the data files for filebufs
|
# Copy over the data files for filebufs
|
||||||
cp $SRC_DIR/testsuite/27_io/*.txt $TEST_DIR
|
cp $SRC_DIR/testsuite/27_io/*.txt $TEST_DIR
|
||||||
cp $SRC_DIR/testsuite/27_io/*.tst $TEST_DIR
|
cp $SRC_DIR/testsuite/27_io/*.tst $TEST_DIR
|
||||||
|
@ -122,7 +124,7 @@ chmod u+w $TEST_DIR/*.tst
|
||||||
# Emit useful info about compiler and platform
|
# Emit useful info about compiler and platform
|
||||||
echo "host: $(uname -mrsv)" >> $RESULTS_FILE
|
echo "host: $(uname -mrsv)" >> $RESULTS_FILE
|
||||||
echo "compiler: $($CXX -v 2>&1)" >> $RESULTS_FILE
|
echo "compiler: $($CXX -v 2>&1)" >> $RESULTS_FILE
|
||||||
echo "compiler flags: $CXX_FLAG" >> $RESULTS_FILE
|
echo "compiler flags: $CXXFLAGS" >> $RESULTS_FILE
|
||||||
echo "date: $(date +%Y%m%d)" >> $RESULTS_FILE
|
echo "date: $(date +%Y%m%d)" >> $RESULTS_FILE
|
||||||
echo "" >> $RESULTS_FILE
|
echo "" >> $RESULTS_FILE
|
||||||
|
|
||||||
|
@ -297,9 +299,9 @@ test_file()
|
||||||
# eventually have to calculate time_t anyhow. Or 3) just grab two
|
# eventually have to calculate time_t anyhow. Or 3) just grab two
|
||||||
# time_t's (no more overhead than grabbing two date(1)'s).
|
# time_t's (no more overhead than grabbing two date(1)'s).
|
||||||
compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME $LIBS"
|
compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME $LIBS"
|
||||||
COMP_TIME_START=$($TEST_DIR/printnow)
|
COMP_TIME_START=$($TIMER_COMMAND)
|
||||||
$compiler_invocation >> compile.out 2>&1
|
$compiler_invocation >> compile.out 2>&1
|
||||||
COMP_TIME_END=$($TEST_DIR/printnow)
|
COMP_TIME_END=$($TIMER_COMMAND)
|
||||||
|
|
||||||
if [ $COMP_TIME_START -lt $COMP_TIME_END ]; then
|
if [ $COMP_TIME_START -lt $COMP_TIME_END ]; then
|
||||||
C_TIME=$[ $COMP_TIME_END - $COMP_TIME_START ]
|
C_TIME=$[ $COMP_TIME_END - $COMP_TIME_START ]
|
||||||
|
@ -366,7 +368,7 @@ echo "------------------------------------------------------------------------"
|
||||||
printf "static\tshared\ttest\n"
|
printf "static\tshared\ttest\n"
|
||||||
echo "------------------------------------------------------------------------"
|
echo "------------------------------------------------------------------------"
|
||||||
|
|
||||||
TEST_TIME_START=$($TEST_DIR/printnow)
|
TEST_TIME_START=$($TIMER_COMMAND)
|
||||||
for NAME in `cat $TESTS_FILE`
|
for NAME in `cat $TESTS_FILE`
|
||||||
do
|
do
|
||||||
PRE_NAME="$TEST_DIR/`basename $NAME`"
|
PRE_NAME="$TEST_DIR/`basename $NAME`"
|
||||||
|
@ -389,7 +391,7 @@ do
|
||||||
|
|
||||||
echo "" >> $RESULTS_FILE
|
echo "" >> $RESULTS_FILE
|
||||||
done
|
done
|
||||||
TEST_TIME_END=$($TEST_DIR/printnow)
|
TEST_TIME_END=$($TIMER_COMMAND)
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -29,9 +29,10 @@
|
||||||
# LTCXX libtoolized command to compile a C++ program
|
# LTCXX libtoolized command to compile a C++ program
|
||||||
# LIBS flags to pass to the linker
|
# LIBS flags to pass to the linker
|
||||||
# LTEXE libtoolized command to run a compiled C++ program
|
# LTEXE libtoolized command to run a compiled C++ program
|
||||||
|
# CXX which C++ compiler is being used
|
||||||
|
# CXXFLAGS special C++ flags used
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Utility functions
|
## Utility functions
|
||||||
##
|
##
|
||||||
|
@ -173,5 +174,5 @@ case ${query} in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo ${BUILD_DIR}:${SRC_DIR}:${PREFIX_DIR}:${LTCXX}:${LIBS}:${LTEXE}
|
echo ${BUILD_DIR}:${SRC_DIR}:${PREFIX_DIR}:${LTCXX}:${LIBS}:${LTEXE}:${CXX}:${CXXFLAGS}
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Reference in New Issue