All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rich Johnston <rjohnston@sgi.com>
To: Wang Sheng-Hui <shhuiw@gmail.com>
Cc: xfstests <xfs@oss.sgi.com>, Dave Chinner <dchinner@redhat.com>
Subject: Re: [PATCH v3] xfstests: make install support common/ and tests/ dirs
Date: Mon, 15 Apr 2013 08:01:04 -0500	[thread overview]
Message-ID: <516BFA10.6020102@sgi.com> (raw)
In-Reply-To: <516937F9.1020101@gmail.com>

On 04/13/2013 05:48 AM, Wang Sheng-Hui wrote:

> diff --git a/Makefile b/Makefile
> index 6edd55c..611b36d 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)
> +TESTS_DIR = tests
> +export TESTS_DIR
> +
> +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
>
>   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)
>       $(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:


Not sure why Makefile above would not apply. I did the following:

git reset --hard 2bfce6d3 # Revert to commit before v2 of this patch.

Attemted to apply patch

Applying patch v3-xfstests-make-install-support-common-and-tests-dirs.patch
patching file Makefile
Hunk #1 FAILED at 52.
Hunk #2 FAILED at 94.
2 out of 2 hunks FAILED -- rejects in file Makefile

So I replaced your Makefile patch with

  > diff --git a/Makefile b/Makefile
> index 6edd55c..b01491e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -52,12 +52,14 @@ 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)
> +TESTS_DIR = tests
> +export TESTS_DIR
> +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
>
>  default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
>  ifeq ($(HAVE_BUILDDEFS), no)
> @@ -91,12 +93,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)
>  	$(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:

Will revert v2 (git revert 2519a97d) and commit with this minor change 
is Dave agrees to your latest version.

Thanks
--Rich


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2013-04-15 13:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-13 10:48 [PATCH v3] xfstests: make install support common/ and tests/ dirs Wang Sheng-Hui
2013-04-15 13:01 ` Rich Johnston [this message]
2013-04-15 23:28   ` Wang Sheng-Hui
2013-04-22 13:51   ` Rich Johnston

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=516BFA10.6020102@sgi.com \
    --to=rjohnston@sgi.com \
    --cc=dchinner@redhat.com \
    --cc=shhuiw@gmail.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.