mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
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 <shhuiw@gmail.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
[rjohnston@sgi.com Minor modification to Makefile]
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
committed by
Rich Johnston
parent
2bfce6d36f
commit
2519a97d10
@@ -52,12 +52,13 @@ LDIRT += $(SRCTAR)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
LIB_SUBDIRS = include lib
|
LIB_SUBDIRS = include lib
|
||||||
TOOL_SUBDIRS = ltp src m4
|
TOOL_SUBDIRS = ltp src m4 common
|
||||||
ifeq ($(HAVE_DMAPI), true)
|
ifeq ($(HAVE_DMAPI), true)
|
||||||
TOOL_SUBDIRS += dmapi
|
TOOL_SUBDIRS += dmapi
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
|
export TESTS_DIR = tests
|
||||||
|
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
|
||||||
|
|
||||||
default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
|
default: include/builddefs $(DMAPI_MAKEFILE) $(TESTS)
|
||||||
ifeq ($(HAVE_BUILDDEFS), no)
|
ifeq ($(HAVE_BUILDDEFS), no)
|
||||||
@@ -91,12 +92,7 @@ depend: include/builddefs $(addsuffix -depend,$(SUBDIRS))
|
|||||||
install: default $(addsuffix -install,$(SUBDIRS))
|
install: default $(addsuffix -install,$(SUBDIRS))
|
||||||
$(INSTALL) -m 755 -d $(PKG_LIB_DIR)
|
$(INSTALL) -m 755 -d $(PKG_LIB_DIR)
|
||||||
$(INSTALL) -m 755 check $(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 randomize.awk $(PKG_LIB_DIR)
|
||||||
$(INSTALL) -m 644 [0-9]??.* $(PKG_LIB_DIR)
|
|
||||||
$(INSTALL) -m 644 common* $(PKG_LIB_DIR)
|
|
||||||
|
|
||||||
# Nothing.
|
# Nothing.
|
||||||
install-dev install-lib:
|
install-dev install-lib:
|
||||||
|
|||||||
@@ -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:
|
||||||
@@ -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
|
||||||
@@ -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:
|
||||||
@@ -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:
|
||||||
@@ -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:
|
||||||
@@ -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:
|
||||||
@@ -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:
|
||||||
@@ -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:
|
||||||
Reference in New Issue
Block a user