xfs
[Top] [All Lists]

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

To: Dave Chinner <dchinner@xxxxxxxxxx>, Rich Johnston <rjohnston@xxxxxxx>, Dave Chinner <david@xxxxxxxxxxxxx>, xfstests <xfs@xxxxxxxxxxx>
Subject: [PATCH v3] xfstests: make install support common/ and tests/ dirs
From: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
Date: Sat, 13 Apr 2013 18:48:25 +0800
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:subject :content-type:content-transfer-encoding; bh=TnlYVfyTM9d2v8HWjGObM+phG62781GG2P+OkrX5SZs=; b=tNLpmFsYzQoc1kOLA5zFxgZm4/sSmlVA3coUXEKUcmj5xPUkjCMLN4dcoFiuuxObRQ iWThU2jadvIGW59HvYKWLABOs5ZwB6KHyYmGWPwktKN8z4xYcHCFxe9tUG7Svo+uKMQu inXH80zB4x+bEpMEqrXPeR5IgxFk0P3BrTdNiQsdIPHN+xdAYF568sbKMMMs85sGsBGK P+tnkhQSXjg0NpJtUPcm0+hC6Pe/cszYOw+ubwQwy+gJZTiQYijIP90pjgmyY28fWomV JVeMnCNSq29ojoKrFbzi71soSmRvAs3EpNpNJTx7XIhphizRycePt4HXsTlIIc/ZGFFD gy9w==
User-agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Thunderbird/17.0
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@xxxxxxxxx>
---
 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

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