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

[Rich Johnston <rjohnston@xxxxxxx>]

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)
        $(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