diff options
| author | Jan Hubicka <jh@suse.cz> | 2010-06-01 16:39:22 +0000 |
|---|---|---|
| committer | Jan Hubicka <jh@suse.cz> | 2010-06-01 16:39:22 +0000 |
| commit | e8282f7f9948f4386471d81e5f0ec30de84971aa (patch) | |
| tree | 42a95182dbd7445f2265c62be16b959236e0d3ba /contrib | |
| parent | 1b7559badc46b689373abeb6302fa0d586234d7b (diff) | |
Merge from mainline.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/pretty-ipa@160113 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/dg-extract-results.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 3a5f8f56597..60afb708be4 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * dg-extract-results.sh: Redirect grep output to /dev/null instead + of grep -q. + 2010-04-22 Basile Starynkevitch <basile@starynkevitch.net> * gcc_update: Sets the locale to C. diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 0ad85cb7aa2..be7d47b1ec5 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -224,7 +224,7 @@ else VARIANTS="" for VAR in $VARS do - grep -q "Running target $VAR" $SUM_FILES && VARIANTS="$VARIANTS $VAR" + grep "Running target $VAR" $SUM_FILES > /dev/null && VARIANTS="$VARIANTS $VAR" done fi @@ -418,6 +418,6 @@ cat ${TMP}/var-* | $AWK -f $TOTAL_AWK # This is ugly, but if there's version output from the compiler under test # at the end of the file, we want it. The other thing that might be there # is the final summary counts. -tail -2 $FIRST_SUM | grep -q '^#' || tail -2 $FIRST_SUM +tail -2 $FIRST_SUM | grep '^#' > /dev/null || tail -2 $FIRST_SUM exit 0 |