xfs
[Top] [All Lists]

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

To: Rich Johnston <rjohnston@xxxxxxx>
Subject: Re: [PATCH] xfstests: make install support common/ and tests/ dirs
From: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
Date: Fri, 12 Apr 2013 07:49:50 +0800
Cc: Dave Chinner <dchinner@xxxxxxxxxx>, xfstests <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=9coLdqoh6BwARA6L50gxQtQjOxe6PP+COVn3CMXqz5k=; b=xCRx0ZH+SaFoXnVP0aIlA9A406xMmudZJuSxmp4nXXAZ+nZdcV24TLe5efzYP4CTHH pUbwsbq0NoIxlgRx9bEjb2tuGDDhhBFa51LVJodliYN2G1O/YthaMMVTTHV+P5yjUOFY JMIR6sPdytykeTro1sKwvSxQZQKx6S9w8Xh2OddarMC/2zjlNhxExoQ9mgXB/iQT1J5V EsUs+EhKMlBBKEnkjCu6lK3rsVg8vjAcl6IsGVd671dqoccDJhcvFNHIqDA9TjPE95lq jpx+3RM/EQa8O/9EJx8Sxi3+eo3lNsxkxoypC6GhD5O3wy48XErP4lXm3bft+2Bb8cgR 16ew==
In-reply-to: <5166D6BE.4050907@xxxxxxx>
References: <5166BA24.1060809@xxxxxxxxx> <5166D6BE.4050907@xxxxxxx>
User-agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Thunderbird/17.0
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

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