* [patch] [fixincludes] Ignore .DS_Store junk files when running make check
@ 2015-07-05 4:24 Eric Gallager
2015-07-05 7:44 ` Andreas Schwab
0 siblings, 1 reply; 11+ messages in thread
From: Eric Gallager @ 2015-07-05 4:24 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
I've attached trivial, 1-line patch to fixincludes_check.tpl; it
allows 'make check' to succeed on OS X, by ignoring the files that
Finder creates to keep track of the status of directories.
-Eric Gallager
[-- Attachment #2: fixincludes_check.tpl.diff --]
[-- Type: text/plain, Size: 364 bytes --]
fixincludes/check.tpl | 1 +
1 file changed, 1 insertion(+)
diff --git a/fixincludes/check.tpl b/fixincludes/check.tpl
index 0d1f444..300aeac 100644
--- a/fixincludes/check.tpl
+++ b/fixincludes/check.tpl
@@ -143,6 +143,7 @@ cd $TESTBASE
find * -type f -print | \
fgrep -v 'CVS/' | \
+fgrep -v '.DS_Store' | \
fgrep -v '.svn/' > ${TESTDIR}/LIST
exitok=`
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [patch] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-05 4:24 [patch] [fixincludes] Ignore .DS_Store junk files when running make check Eric Gallager
@ 2015-07-05 7:44 ` Andreas Schwab
2015-07-05 22:59 ` Eric Gallager
0 siblings, 1 reply; 11+ messages in thread
From: Andreas Schwab @ 2015-07-05 7:44 UTC (permalink / raw)
To: Eric Gallager; +Cc: gcc-patches
Eric Gallager <egall@gwmail.gwu.edu> writes:
> I've attached trivial, 1-line patch to fixincludes_check.tpl; it
> allows 'make check' to succeed on OS X, by ignoring the files that
> Finder creates to keep track of the status of directories.
>
> -Eric Gallager
> fixincludes/check.tpl | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fixincludes/check.tpl b/fixincludes/check.tpl
> index 0d1f444..300aeac 100644
> --- a/fixincludes/check.tpl
> +++ b/fixincludes/check.tpl
> @@ -143,6 +143,7 @@ cd $TESTBASE
>
> find * -type f -print | \
> fgrep -v 'CVS/' | \
> +fgrep -v '.DS_Store' | \
> fgrep -v '.svn/' > ${TESTDIR}/LIST
>
> exitok=`
find ... ! -name .DS_Store ...
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [patch] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-05 7:44 ` Andreas Schwab
@ 2015-07-05 22:59 ` Eric Gallager
2015-07-06 17:00 ` Andreas Schwab
2015-07-06 19:40 ` Jeff Law
0 siblings, 2 replies; 11+ messages in thread
From: Eric Gallager @ 2015-07-05 22:59 UTC (permalink / raw)
To: Andreas Schwab; +Cc: gcc-patches
I was just matching the code that was already used there... should the
lines to ignore the CVS and .svn folders be re-written into the style
you propose, too?
On 7/5/15, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Eric Gallager <egall@gwmail.gwu.edu> writes:
>
>> I've attached trivial, 1-line patch to fixincludes_check.tpl; it
>> allows 'make check' to succeed on OS X, by ignoring the files that
>> Finder creates to keep track of the status of directories.
>>
>> -Eric Gallager
>> fixincludes/check.tpl | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/fixincludes/check.tpl b/fixincludes/check.tpl
>> index 0d1f444..300aeac 100644
>> --- a/fixincludes/check.tpl
>> +++ b/fixincludes/check.tpl
>> @@ -143,6 +143,7 @@ cd $TESTBASE
>>
>> find * -type f -print | \
>> fgrep -v 'CVS/' | \
>> +fgrep -v '.DS_Store' | \
>> fgrep -v '.svn/' > ${TESTDIR}/LIST
>>
>> exitok=`
>
> find ... ! -name .DS_Store ...
>
> Andreas.
>
> --
> Andreas Schwab, schwab@linux-m68k.org
> GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
> "And now for something completely different."
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [patch] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-05 22:59 ` Eric Gallager
@ 2015-07-06 17:00 ` Andreas Schwab
2015-07-06 19:40 ` Jeff Law
1 sibling, 0 replies; 11+ messages in thread
From: Andreas Schwab @ 2015-07-06 17:00 UTC (permalink / raw)
To: Eric Gallager; +Cc: gcc-patches
Eric Gallager <egall@gwmail.gwu.edu> writes:
> I was just matching the code that was already used there... should the
> lines to ignore the CVS and .svn folders be re-written into the style
> you propose, too?
Yes, that would be an improvement.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [patch] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-05 22:59 ` Eric Gallager
2015-07-06 17:00 ` Andreas Schwab
@ 2015-07-06 19:40 ` Jeff Law
2015-07-27 22:33 ` Eric Gallager
1 sibling, 1 reply; 11+ messages in thread
From: Jeff Law @ 2015-07-06 19:40 UTC (permalink / raw)
To: Eric Gallager, Andreas Schwab; +Cc: gcc-patches
On 07/05/2015 04:58 PM, Eric Gallager wrote:
> I was just matching the code that was already used there... should the
> lines to ignore the CVS and .svn folders be re-written into the style
> you propose, too?
Might as well have a consistent style. Embedding them into the "find"
ought to be marginally faster than a pipeline of fgrep processes.
jeff
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [patch] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-06 19:40 ` Jeff Law
@ 2015-07-27 22:33 ` Eric Gallager
2015-07-27 23:14 ` Andreas Schwab
0 siblings, 1 reply; 11+ messages in thread
From: Eric Gallager @ 2015-07-27 22:33 UTC (permalink / raw)
To: Jeff Law; +Cc: Andreas Schwab, gcc-patches, bkorb
On 7/6/15, Jeff Law <law@redhat.com> wrote:
> On 07/05/2015 04:58 PM, Eric Gallager wrote:
>> I was just matching the code that was already used there... should the
>> lines to ignore the CVS and .svn folders be re-written into the style
>> you propose, too?
> Might as well have a consistent style. Embedding them into the "find"
> ought to be marginally faster than a pipeline of fgrep processes.
>
> jeff
>
Okay, I tried embedding "! -name CVS/ ! -name .svn/" into the find
command, too, but
that just led to warnings such as:
find: warning: Unix filenames usually don't contain slashes (though
pathnames do). That means that '-name `CVS/'' will probably evaluate
to false all the time on this system. You might find the '-wholename'
test more useful, or perhaps '-samefile'. Alternatively, if you are
using GNU grep, you could use 'find ... -print0 | grep -FzZ `CVS/''.
find: warning: Unix filenames usually don't contain slashes (though
pathnames do). That means that '-name `.svn/'' will probably evaluate
to false all the time on this system. You might find the '-wholename'
test more useful, or perhaps '-samefile'. Alternatively, if you are
using GNU grep, you could use 'find ... -print0 | grep -FzZ `.svn/''.
I'm not really sure which of these alternatives to go with... cc-ing
the fixincludes maintainer to see which he wants to go with...
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [patch] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-27 22:33 ` Eric Gallager
@ 2015-07-27 23:14 ` Andreas Schwab
2015-07-28 3:08 ` [PATCHv2] " Eric Gallager
0 siblings, 1 reply; 11+ messages in thread
From: Andreas Schwab @ 2015-07-27 23:14 UTC (permalink / raw)
To: Eric Gallager; +Cc: Jeff Law, gcc-patches, bkorb
Eric Gallager <egall@gwmail.gwu.edu> writes:
> Okay, I tried embedding "! -name CVS/ ! -name .svn/" into the find
-name does an exact match, so you don't need the slash.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-27 23:14 ` Andreas Schwab
@ 2015-07-28 3:08 ` Eric Gallager
2015-07-28 14:13 ` Bruce Korb
2015-07-28 18:43 ` Mike Stump
0 siblings, 2 replies; 11+ messages in thread
From: Eric Gallager @ 2015-07-28 3:08 UTC (permalink / raw)
To: Andreas Schwab; +Cc: Jeff Law, gcc-patches, bkorb
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
On 7/27/15, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Eric Gallager <egall@gwmail.gwu.edu> writes:
>
>> Okay, I tried embedding "! -name CVS/ ! -name .svn/" into the find
>
> -name does an exact match, so you don't need the slash.
>
> Andreas.
>
Okay, attached a new version of the patch; make check for fixincludes
still passes with it. Could someone commit it for me? I don't have
commit access. It's still pretty trivial, so I shouldn't need a
copyright assignment for it, should I?
Eric.
[-- Attachment #2: fixincludes_check.tpl.diff --]
[-- Type: text/plain, Size: 487 bytes --]
fixincludes/check.tpl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fixincludes/check.tpl b/fixincludes/check.tpl
index 0d1f444..ffd2b66 100644
--- a/fixincludes/check.tpl
+++ b/fixincludes/check.tpl
@@ -141,9 +141,8 @@ echo $exitok`
cd $TESTBASE
-find * -type f -print | \
-fgrep -v 'CVS/' | \
-fgrep -v '.svn/' > ${TESTDIR}/LIST
+find * -type f ! -name .DS_Store ! -name CVS ! -name .svn -print \
+> ${TESTDIR}/LIST
exitok=`
exec < ${TESTDIR}/LIST
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-28 3:08 ` [PATCHv2] " Eric Gallager
@ 2015-07-28 14:13 ` Bruce Korb
2015-07-28 18:18 ` Mike Stump
2015-07-28 18:43 ` Mike Stump
1 sibling, 1 reply; 11+ messages in thread
From: Bruce Korb @ 2015-07-28 14:13 UTC (permalink / raw)
To: Eric Gallager; +Cc: Andreas Schwab, Jeff Law, gcc-patches
Definitely much better. I won't apply it until the weekend, so
someone else will likely beat me to it. Thank you.
On Mon, Jul 27, 2015 at 7:36 PM, Eric Gallager <egall@gwmail.gwu.edu> wrote:
> On 7/27/15, Andreas Schwab <schwab@linux-m68k.org> wrote:
>> Eric Gallager <egall@gwmail.gwu.edu> writes:
>>
>>> Okay, I tried embedding "! -name CVS/ ! -name .svn/" into the find
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-28 14:13 ` Bruce Korb
@ 2015-07-28 18:18 ` Mike Stump
0 siblings, 0 replies; 11+ messages in thread
From: Mike Stump @ 2015-07-28 18:18 UTC (permalink / raw)
To: Bruce Korb; +Cc: Eric Gallager, Andreas Schwab, Jeff Law, gcc-patches
On Jul 28, 2015, at 6:38 AM, Bruce Korb <bkorb@gnu.org> wrote:
> Definitely much better. I won't apply it until the weekend, so
> someone else will likely beat me to it.
Looks good to me as well, I checked it in.
Committed revision 226317.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] [fixincludes] Ignore .DS_Store junk files when running make check
2015-07-28 3:08 ` [PATCHv2] " Eric Gallager
2015-07-28 14:13 ` Bruce Korb
@ 2015-07-28 18:43 ` Mike Stump
1 sibling, 0 replies; 11+ messages in thread
From: Mike Stump @ 2015-07-28 18:43 UTC (permalink / raw)
To: Eric Gallager; +Cc: Andreas Schwab, Jeff Law, gcc-patches, bkorb
On Jul 27, 2015, at 7:36 PM, Eric Gallager <egall@gwmail.gwu.edu> wrote:
> On 7/27/15, Andreas Schwab <schwab@linux-m68k.org> wrote:
>> Eric Gallager <egall@gwmail.gwu.edu> writes:
>>
>>> Okay, I tried embedding "! -name CVS/ ! -name .svn/" into the find
>>
>> -name does an exact match, so you don't need the slash.
> Okay, attached a new version of the patch; make check for fixincludes
> still passes with it.
If someone can test the gcc-5 branch with it and if it fixes it, I’ll approve it for the 5 branch as well.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-07-28 18:18 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-05 4:24 [patch] [fixincludes] Ignore .DS_Store junk files when running make check Eric Gallager
2015-07-05 7:44 ` Andreas Schwab
2015-07-05 22:59 ` Eric Gallager
2015-07-06 17:00 ` Andreas Schwab
2015-07-06 19:40 ` Jeff Law
2015-07-27 22:33 ` Eric Gallager
2015-07-27 23:14 ` Andreas Schwab
2015-07-28 3:08 ` [PATCHv2] " Eric Gallager
2015-07-28 14:13 ` Bruce Korb
2015-07-28 18:18 ` Mike Stump
2015-07-28 18:43 ` Mike Stump
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).