Makefile.am (check-compile): New.

2005-01-20  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/Makefile.am (check-compile): New.
	* testsuite/Makefile.in: Regenerate.
	* scripts/check_compile_time: New.
	* scripts/check_performance: Tweaks.

From-SVN: r93980
This commit is contained in:
Benjamin Kosnik 2005-01-20 20:28:41 +00:00 committed by Benjamin Kosnik
parent 3c46c513c2
commit 45d5f9afed
5 changed files with 73 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2005-01-20 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/Makefile.am (check-compile): New.
* testsuite/Makefile.in: Regenerate.
* scripts/check_compile_time: New.
* scripts/check_performance: Tweaks.
2005-01-19 Paolo Carlini <pcarlini@suse.de> 2005-01-19 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/19535 PR libstdc++/19535

View File

@ -0,0 +1,49 @@
#!/usr/bin/env bash
# Script to do performance testing.
# Invocation
# check_performance SRC_DIR BUILD_DIR
# 1: variables
#
SRC_DIR=$1
BUILD_DIR=$2
# Now that we've successfully translated the numerical option into
# a symbolic one, we can safely ignore it.
shift
# This has been true all along. Found out about it the hard way...
case $BASH_VERSION in
1*)
echo 'You need bash 2.x to run check_performance. Exiting.';
exit 1 ;;
*) ;;
esac
flags_script=$BUILD_DIR/scripts/testsuite_flags
INCLUDES=`$flags_script --build-includes`
PCH_FLAGS=`$flags_script --cxxpchflags`
FLAGS=`$flags_script --cxxflags`
TEST_FLAGS="-S"
COMPILER=`$flags_script --build-cxx`
CXX="$COMPILER $INCLUDES $PCH_FLAGS $FLAGS $TEST_FLAGS"
TESTS_FILE="testsuite_files"
for NAME in `cat $TESTS_FILE`
do
if $RUN; then
echo $NAME
FILE_NAME="`basename $NAME`"
OUTPUT_NAME="`echo $FILE_NAME | sed 's/cc$/s/'`"
$CXX $SRC_DIR/testsuite/$NAME -o $OUTPUT_NAME
if [ -f $OUTPUT_NAME ]; then
rm $OUTPUT_NAME
fi
echo ""
fi
done
exit 0

View File

@ -23,7 +23,8 @@ case $BASH_VERSION in
esac esac
flags_script=$BUILD_DIR/scripts/testsuite_flags flags_script=$BUILD_DIR/scripts/testsuite_flags
INCLUDES="`$flags_script --build-includes` -include bits/stdc++.h" INCLUDES=`$flags_script --build-includes`
PCH_FLAGS=`$flags_script --cxxpchflags`
FLAGS=`$flags_script --cxxflags` FLAGS=`$flags_script --cxxflags`
THREAD_FLAG='-pthread' THREAD_FLAG='-pthread'
COMPILER=`$flags_script --build-cxx` COMPILER=`$flags_script --build-cxx`
@ -31,8 +32,8 @@ SH_FLAG="-Wl,--rpath -Wl,$BUILD_DIR/../../gcc \
-Wl,--rpath -Wl,$BUILD_DIR/src/.libs" -Wl,--rpath -Wl,$BUILD_DIR/src/.libs"
ST_FLAG="-static" ST_FLAG="-static"
LINK=$SH_FLAG LINK=$SH_FLAG
CXX="$COMPILER $INCLUDES $FLAGS -DNOTHREAD $LINK" CXX="$COMPILER $INCLUDES $PCH_FLAGS $FLAGS -DNOTHREAD $LINK"
CXX_THREAD="$COMPILER $INCLUDES $FLAGS $THREAD_FLAG $LINK" CXX_THREAD="$COMPILER $INCLUDES $PCH_FLAGS $FLAGS $THREAD_FLAG $LINK"
TESTS_FILE="testsuite_files_performance" TESTS_FILE="testsuite_files_performance"

View File

@ -180,6 +180,12 @@ check-performance: testsuite_files_performance ${performance_script}
-@(chmod + ${performance_script}; \ -@(chmod + ${performance_script}; \
${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir}) ${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
# Runs the testsuite, but in compile only mode, and times it.
# See script.
compile_script=${glibcxx_srcdir}/scripts/check_compile
check-compile: testsuite_files ${compile_script}
-@(chmod + ${compile_script}; \
${compile_script} ${glibcxx_srcdir} ${glibcxx_builddir})
# This rule generates all of the testsuite_files* lists at once. # This rule generates all of the testsuite_files* lists at once.
${lists_of_files}: ${lists_of_files}:

View File

@ -310,6 +310,10 @@ survey_script = ${glibcxx_builddir}/scripts/check_survey
# running this is off by default. # running this is off by default.
performance_script = ${glibcxx_srcdir}/scripts/check_performance performance_script = ${glibcxx_srcdir}/scripts/check_performance
# Runs the testsuite, but in compile only mode, and times it.
# See script.
compile_script = ${glibcxx_srcdir}/scripts/check_compile
# By adding these files here, automake will remove them for 'make clean' # By adding these files here, automake will remove them for 'make clean'
CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \ CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
testsuite_* site.exp abi_check baseline_symbols *TEST* testsuite_* site.exp abi_check baseline_symbols *TEST*
@ -662,6 +666,9 @@ check-script-install: ${survey_script}
check-performance: testsuite_files_performance ${performance_script} check-performance: testsuite_files_performance ${performance_script}
-@(chmod + ${performance_script}; \ -@(chmod + ${performance_script}; \
${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir}) ${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
check-compile: testsuite_files ${compile_script}
-@(chmod + ${compile_script}; \
${compile_script} ${glibcxx_srcdir} ${glibcxx_builddir})
# This rule generates all of the testsuite_files* lists at once. # This rule generates all of the testsuite_files* lists at once.
${lists_of_files}: ${lists_of_files}: