From: Wang Sheng-Hui Date: Fri, 12 Apr 2013 04:26:53 +0000 (+0000) Subject: xfstests: make install support common/ and tests/ dirs X-Git-Tag: v2022.05.01~3457 X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=2519a97d1083efca79006ba5bd4ddb9f4af65a5e xfstests: make install support common/ and tests/ dirs 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. v2 introduces the following changes compared with v1: * Ignore the file 'group' under the top dir, 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 iterating sub dirs under /tests, not by enumeration in tests/Makefile. Signed-off-by: Wang Sheng-Hui Reviewed-by: Rich Johnston [rjohnston@sgi.com Minor modification to Makefile] Signed-off-by: Rich Johnston --- diff --git a/Makefile b/Makefile index 6edd55c1..a7f6f9d3 100644 --- a/Makefile +++ b/Makefile @@ -52,12 +52,13 @@ 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) +export TESTS_DIR = tests +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR) default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS) ifeq ($(HAVE_BUILDDEFS), no) @@ -91,12 +92,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 00000000..5f91e8c3 --- /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 00000000..254dd481 --- /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 = $(shell find . -maxdepth 1 -type d | sed -n -e 's/\.\///gp') + +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 00000000..e1a5be1d --- /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 00000000..7a3c8e1f --- /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 00000000..9529fb86 --- /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 00000000..cbd87f94 --- /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 00000000..1d966589 --- /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 00000000..db94be09 --- /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: