public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] xfstests: make install support common/ and tests/ dirs
@ 2013-04-13 10:48 Wang Sheng-Hui
  2013-04-15 13:01 ` Rich Johnston
  0 siblings, 1 reply; 4+ messages in thread
From: Wang Sheng-Hui @ 2013-04-13 10:48 UTC (permalink / raw)
  To: Dave Chinner, Rich Johnston, Dave Chinner, xfstests

xfstests have some change on the organization of the testcases
and common* files:
     * The common* scripts have been reorganized into the common/ dir.
     * The testcases have been reorganized into sub test dirs under tests/.
     * The run.* scripts have been removed.

This patch uses the simple way to make install support above changes:
     Make up one Makefile for each newly created subdirs, which can control
     'make install' separately.

v3 introduces the following change compared with v2:
     * use the neater way by Dave to get the TESTS_SUBDIRS in tests/Makefile.

v2 introduces the following changes compared with v1:
     * Ingore the file 'group' under the topdir, for it's useless in the new
       structures.
     * Remove the redundant comments in the Makefiles.
     * Use XXX_DIR instead of XXX_SUBDIR in the Makefiles under common/ and tests/.
     * Export TESTS_DIR in teh top level Makefile instead of tests/Makefile.
     * Obtain the names of dirs for testcases by interating sub dirs under /tests,
       not by enumeration in tests/Makefile.

Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
---
  Makefile               | 12 +++++-------
  common/Makefile        | 16 ++++++++++++++++
  tests/Makefile         | 19 +++++++++++++++++++
  tests/btrfs/Makefile   | 20 ++++++++++++++++++++
  tests/ext4/Makefile    | 20 ++++++++++++++++++++
  tests/generic/Makefile | 20 ++++++++++++++++++++
  tests/shared/Makefile  | 20 ++++++++++++++++++++
  tests/udf/Makefile     | 20 ++++++++++++++++++++
  tests/xfs/Makefile     | 20 ++++++++++++++++++++
  9 files changed, 160 insertions(+), 7 deletions(-)
  create mode 100644 common/Makefile
  create mode 100644 tests/Makefile
  create mode 100644 tests/btrfs/Makefile
  create mode 100644 tests/ext4/Makefile
  create mode 100644 tests/generic/Makefile
  create mode 100644 tests/shared/Makefile
  create mode 100644 tests/udf/Makefile
  create mode 100644 tests/xfs/Makefile

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:
diff --git a/common/Makefile b/common/Makefile
new file mode 100644
index 0000000..5f91e8c
--- /dev/null
+++ b/common/Makefile
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ..
+include $(TOPDIR)/include/builddefs
+
+COMMON_DIR = common
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/$(COMMON_DIR)
+	$(INSTALL) -m 644 * $(PKG_LIB_DIR)/$(COMMON_DIR)
+
+install-dev install-lib:
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..522df8e
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ..
+include $(TOPDIR)/include/builddefs
+
+TESTS_SUBDIRS = $(sort $(dir $(wildcard $(PWD)/$(TESTS_DIR)/[a-z]*/)))
+
+include $(BUILDRULES)
+
+install: $(addsuffix -install,$(TESTS_SUBDIRS))
+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/$(TESTS_DIR)
+
+# Nothing.
+install-dev install-lib:
+
+%-install:
+	$(MAKE) $(MAKEOPTS) -C $* install
diff --git a/tests/btrfs/Makefile b/tests/btrfs/Makefile
new file mode 100644
index 0000000..e1a5be1
--- /dev/null
+++ b/tests/btrfs/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ../..
+include $(TOPDIR)/include/builddefs
+
+BTRFS_DIR = btrfs
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(BTRFS_DIR)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(TARGET_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
+	$(INSTALL) -m 644 group $(TARGET_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
+
+# Nothing.
+install-dev install-lib:
diff --git a/tests/ext4/Makefile b/tests/ext4/Makefile
new file mode 100644
index 0000000..7a3c8e1
--- /dev/null
+++ b/tests/ext4/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ../..
+include $(TOPDIR)/include/builddefs
+
+EXT4_DIR = ext4
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(EXT4_DIR)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(TARGET_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
+	$(INSTALL) -m 644 group $(TARGET_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
+
+# Nothing.
+install-dev install-lib:
diff --git a/tests/generic/Makefile b/tests/generic/Makefile
new file mode 100644
index 0000000..9529fb8
--- /dev/null
+++ b/tests/generic/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ../..
+include $(TOPDIR)/include/builddefs
+
+GENERIC_DIR = generic
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(GENERIC_DIR)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(TARGET_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
+	$(INSTALL) -m 644 group $(TARGET_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
+
+# Nothing.
+install-dev install-lib:
diff --git a/tests/shared/Makefile b/tests/shared/Makefile
new file mode 100644
index 0000000..cbd87f9
--- /dev/null
+++ b/tests/shared/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ../..
+include $(TOPDIR)/include/builddefs
+
+SHARED_DIR = shared
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(SHARED_DIR)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(TARGET_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
+	$(INSTALL) -m 644 group $(TARGET_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
+
+# Nothing.
+install-dev install-lib:
diff --git a/tests/udf/Makefile b/tests/udf/Makefile
new file mode 100644
index 0000000..1d96658
--- /dev/null
+++ b/tests/udf/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ../..
+include $(TOPDIR)/include/builddefs
+
+UDF_DIR = udf
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(UDF_DIR)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(TARGET_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
+	$(INSTALL) -m 644 group $(TARGET_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
+
+# Nothing.
+install-dev install-lib:
diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile
new file mode 100644
index 0000000..db94be0
--- /dev/null
+++ b/tests/xfs/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2003-2005 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ../..
+include $(TOPDIR)/include/builddefs
+
+XFS_DIR = xfs
+TARGET_DIR = $(PKG_LIB_DIR)/$(TESTS_DIR)/$(XFS_DIR)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(TARGET_DIR)
+	$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
+	$(INSTALL) -m 644 group $(TARGET_DIR)
+	$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
+
+# Nothing.
+install-dev install-lib:
-- 
1.7.12.4

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v3] xfstests: make install support common/ and tests/ dirs
  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
  2013-04-15 23:28   ` Wang Sheng-Hui
  2013-04-22 13:51   ` Rich Johnston
  0 siblings, 2 replies; 4+ messages in thread
From: Rich Johnston @ 2013-04-15 13:01 UTC (permalink / raw)
  To: Wang Sheng-Hui; +Cc: xfstests, Dave Chinner

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v3] xfstests: make install support common/ and tests/ dirs
  2013-04-15 13:01 ` Rich Johnston
@ 2013-04-15 23:28   ` Wang Sheng-Hui
  2013-04-22 13:51   ` Rich Johnston
  1 sibling, 0 replies; 4+ messages in thread
From: Wang Sheng-Hui @ 2013-04-15 23:28 UTC (permalink / raw)
  To: Rich Johnston; +Cc: xfstests, Dave Chinner

On 2013年04月15日 21:01, Rich Johnston wrote:
> 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!

Regards,
Sheng-Hui

>
> Thanks
> --Rich
>
>

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v3] xfstests: make install support common/ and tests/ dirs
  2013-04-15 13:01 ` Rich Johnston
  2013-04-15 23:28   ` Wang Sheng-Hui
@ 2013-04-22 13:51   ` Rich Johnston
  1 sibling, 0 replies; 4+ messages in thread
From: Rich Johnston @ 2013-04-22 13:51 UTC (permalink / raw)
  To: Wang Sheng-Hui; +Cc: Dave Chinner, xfstests

On 04/15/2013 08:01 AM, Rich Johnston wrote:

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


Dave,

May I put your Reviewed-by: on V3 of this patch?

Thanks
--Rich

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-22 13:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2013-04-15 23:28   ` Wang Sheng-Hui
2013-04-22 13:51   ` Rich Johnston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox