xfs
[Top] [All Lists]

Re: [PATCH v3] xfstests: make install support common/ and tests/ dirs

To: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
Subject: Re: [PATCH v3] xfstests: make install support common/ and tests/ dirs
From: Rich Johnston <rjohnston@xxxxxxx>
Date: Mon, 15 Apr 2013 08:01:04 -0500
Cc: Dave Chinner <dchinner@xxxxxxxxxx>, Dave Chinner <david@xxxxxxxxxxxxx>, xfstests <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <516937F9.1020101@xxxxxxxxx>
References: <516937F9.1020101@xxxxxxxxx>
User-agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120615 Thunderbird/13.0.1
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


<Prev in Thread] Current Thread [Next in Thread>