From: Wang Sheng-Hui <shhuiw@gmail.com>
To: Rich Johnston <rjohnston@sgi.com>
Cc: xfstests <xfs@oss.sgi.com>, Dave Chinner <dchinner@redhat.com>
Subject: Re: [PATCH] xfstests: make install support common/ and tests/ dirs
Date: Fri, 12 Apr 2013 07:49:50 +0800 [thread overview]
Message-ID: <51674C1E.9090606@gmail.com> (raw)
In-Reply-To: <5166D6BE.4050907@sgi.com>
On 2013年04月11日 23:29, Rich Johnston wrote:
> Wang Sheng-Hui,
>
> The patch to Makefile would not apply. This is what I used to review.
>
> diff --git a/Makefile b/Makefile
> index 6edd55c..73214ab 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -52,12 +52,15 @@ LDIRT += $(SRCTAR)
> endif
>
> LIB_SUBDIRS = include lib
> -TOOL_SUBDIRS = ltp src m4
> +TOOL_SUBDIRS = ltp src m4 common
> ifeq ($(HAVE_DMAPI), true)
> TOOL_SUBDIRS += dmapi
> endif
>
> -SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
> +# all the tests have been put into tests/
> +TESTS_SUBDIR = tests
> +
> +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_SUBDIR)
>
> default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
> ifeq ($(HAVE_BUILDDEFS), no)
> @@ -91,12 +94,7 @@ depend: include/builddefs $(addsuffix -depend,$(SUBDIRS))
> install: default $(addsuffix -install,$(SUBDIRS))
> $(INSTALL) -m 755 -d $(PKG_LIB_DIR)
> $(INSTALL) -m 755 check $(PKG_LIB_DIR)
> - $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)
> - $(INSTALL) -m 755 run.* $(PKG_LIB_DIR)
> - $(INSTALL) -m 644 group $(PKG_LIB_DIR)
Hi Rich,
This is the different point.
When I scratched the patch against the xfstests( pulled from the git tree,
should be the latest, I think), there is one file "group" under the topdir.
.../xfstests$ pwd
.../xfstests
.../xfstests$ ls | grep group
group
.../xfstests$ cat group
# QA groups control file
# Defines test groups and nominal group owners
# - do not start group names with a digit
# - comment line before each group is "new" description
#
The top "group" file is useless, I think.
Will you please help fixup the patch?
Thanks for your support!
Regards,
Sheng-Hui
> $(INSTALL) -m 644 randomize.awk $(PKG_LIB_DIR)
> - $(INSTALL) -m 644 [0-9]??.* $(PKG_LIB_DIR)
> - $(INSTALL) -m 644 common* $(PKG_LIB_DIR)
>
> # Nothing.
> install-dev install-lib:
>
> Here is your original:
>
>> diff --git a/Makefile b/Makefile
>> index 6edd55c..95e3e5d 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -52,12 +52,15 @@ LDIRT += $(SRCTAR)
>> endif
>>
>> LIB_SUBDIRS = include lib
>> -TOOL_SUBDIRS = ltp src m4
>> +TOOL_SUBDIRS = ltp src m4 common
>> ifeq ($(HAVE_DMAPI), true)
>> TOOL_SUBDIRS += dmapi
>> endif
>>
>> -SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
>> +# all the tests have been put into tests/
>> +TESTS_SUBDIR = tests
>> +
>> +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_SUBDIR)
>>
>> default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
>> ifeq ($(HAVE_BUILDDEFS), no)
>> @@ -91,12 +94,8 @@ depend: include/builddefs $(addsuffix
>> -depend,$(SUBDIRS))
>> install: default $(addsuffix -install,$(SUBDIRS))
>> $(INSTALL) -m 755 -d $(PKG_LIB_DIR)
>> $(INSTALL) -m 755 check $(PKG_LIB_DIR)
>> - $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR)
>> - $(INSTALL) -m 755 run.* $(PKG_LIB_DIR)
>> $(INSTALL) -m 644 group $(PKG_LIB_DIR)
> oops somehow the above line was not deleted
>> $(INSTALL) -m 644 randomize.awk $(PKG_LIB_DIR)
>> - $(INSTALL) -m 644 [0-9]??.* $(PKG_LIB_DIR)
>> - $(INSTALL) -m 644 common* $(PKG_LIB_DIR)
>>
>> # Nothing.
>> install-dev install-lib:
>
> The rest of the patch looked good. If you agree with my slight mod then I will put my Reviewed-by and commit it.
>
> Thanks
> --Rich
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-04-11 23:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 13:27 [PATCH] xfstests: make install support common/ and tests/ dirs Wang Sheng-Hui
2013-04-11 15:29 ` Rich Johnston
2013-04-11 23:49 ` Wang Sheng-Hui [this message]
2013-04-12 0:41 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51674C1E.9090606@gmail.com \
--to=shhuiw@gmail.com \
--cc=dchinner@redhat.com \
--cc=rjohnston@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.