diff options
| author | Benjamin Kosnik <bkoz@purist.soma.redhat.com> | 2000-06-12 23:56:56 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-06-12 23:56:56 +0000 |
| commit | d54a528ae41f74bd3d8686742ae4feed435576d7 (patch) | |
| tree | 0090bc5f57a6ac95e8aa86e89c3e831c2f77ee78 | |
| parent | 431f67e296b52f569c70e45cff71905257254589 (diff) | |
| download | gcc-d54a528ae41f74bd3d8686742ae4feed435576d7.zip gcc-d54a528ae41f74bd3d8686742ae4feed435576d7.tar.gz gcc-d54a528ae41f74bd3d8686742ae4feed435576d7.tar.bz2 | |
mkcheck.in: Clean up confusion regarding NAME, PRE_NAME.
2000-06-12 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* mkcheck.in: Clean up confusion regarding NAME, PRE_NAME.
From-SVN: r34510
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/mkcheck.in | 23 |
2 files changed, 16 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 77ca04c..988901e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2000-06-12 Benjamin Kosnik <bkoz@purist.soma.redhat.com> + + * mkcheck.in: Clean up confusion regarding NAME, PRE_NAME. + 2000-06-08 Branko Cibej <branko.cibej@hermes.si> * acinclude.m4 (GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT): Check for diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index cb1e62a..a597e2b 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -165,10 +165,13 @@ test_file() { # NB: S_FLAG has to be last argument because it may be null, and # error checking hasn't been invented yet. - FILENAME=$1 + NAME=$1 EXENAME=$2 S_FLAG=$3 + SRC_NAME="$SRC_DIR/testsuite/$1" + TEST_NAME="$TEST_DIR/`basename $NAME`" + # This would be deliciously easy if GNU date's %s were always around. # There are three ways to do this: 1) use the builtin 'time' like we # do later; then getting compiler errors into LOG_FILE is a nightmare. @@ -178,7 +181,7 @@ test_file() # time_t's (no more overhead than grabbing two date(1)'s). COMP_TIME_START=$($TEST_DIR/printnow) $CXX $CXX_FLAG $S_FLAG $INC_PATH -L$LIB_PATH -Wl,--rpath -Wl,$LIB_PATH \ - $FILENAME -o $EXENAME 2>> $LOG_FILE + $SRC_NAME -o $EXENAME 2>> $LOG_FILE COMP_TIME_END=$($TEST_DIR/printnow) if [ $COMP_TIME_START -lt $COMP_TIME_END ]; then @@ -250,7 +253,7 @@ test_file() # ls on MATCH, a pattern description generated with sed. # this is the name of the resulting diff file, if any - DIFF_FILE="`echo $PRE_NAME | sed 's/cc$/diff/'`" + DIFF_FILE="`echo $TEST_NAME | sed 's/cc$/diff/'`" # construct wildcard names,ie for $NAME=filebuf.cc, makes # "filebuf*.tst" DATA_FILES="`echo $NAME | sed 's/\.cc/\*\.tst/g'`" @@ -280,15 +283,14 @@ test_file() RESULT="+" fi fi - rm "$EXENAME" # sometimes you want to save all failing exe files for review: - #if [ "$RESULT" = "+" ]; then - # rm "$EXENAME" - #fi + if [ "$RESULT" = "+" ]; then + rm "$EXENAME" + fi else # the file did not compile. Write out compilation info to the log file. echo "$CXX $CXX_FLAG $S_FLAG $INC_PATH -L$LIB_PATH -Wl,--rpath -Wl,$LIB_PATH \ - $FILENAME -o $EXENAME" 2>> $LOG_FILE + $SRC_NAME -o $EXENAME" 2>> $LOG_FILE RESULT="-" TEXT="0" @@ -317,10 +319,9 @@ do PRE_NAME="$TEST_DIR/`basename $NAME`" ST_NAME="`echo $PRE_NAME | sed 's/cc$/st-exe/'`" SH_NAME="`echo $PRE_NAME | sed 's/cc$/sh-exe/'`" - CNAME="$SRC_DIR/testsuite/$NAME" - test_file $CNAME $ST_NAME $ST_FLAG - test_file $CNAME $SH_NAME $SH_FLAG + test_file $NAME $ST_NAME $ST_FLAG + test_file $NAME $SH_NAME $SH_FLAG echo "$NAME" | awk '{printf("%s\n", $1)}' echo "" >> $RESULTS_FILE |