apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix installation for extended names

Browse Source 
xfstests supports extended test names like 314-foo-bar, but
installation of these tests was skipped (not matching a regexp). So
this patch fixes the makefiles in tests/*/

The include/buildrules change was written by Dave Chinner.

Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Jan Tulak
2016-07-11 11:26:06 +02:00
committed by Eryu Guan
parent b62a0b3053
commit cb15a45be8
10 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/buildrules
+32
View File
@@ -100,3 +100,35 @@ MAKEDEP := $(MAKEDEPEND) $(CFLAGS)
cp /dev/null .dep; \
fi
# Gather files for installing into two lists:
# TESTS with executable scripts and OUTFILES with all the test outputs.
# Makefile has a very small matching, so we have to go this long way.
# Start with all test related files:
ALLFILES = $(wildcard [0-9]??*)
# Now build a list of known output files. Unfortunately, the
# multiple output test files are poorly handled as makefiles don't
# handle wildcarded multi-suffix matching. Hence we separate the
# processing of these right now.
EXTENDED_OUTFILES = $(wildcard [0-9]??*.out.*)
EXTENDED_OUTFILE_CFGS = $(wildcard [0-9]??.cfg)
BASIC_OUTFILES = $(wildcard [0-9]??*.out)
OUTFILES = $(EXTENDED_OUTFILES) $(EXTENDED_OUTFILE_CFGS) $(BASIC_OUTFILES)
# Strip suffix to get matching tests. We want to strip from the
# first "." to the end, but makefiles don't have a built in
# operative for that. So:
#
# Hack: strip the multiple segments after .out with repeated basename calls.
EXTFILTER1 = $(basename $(EXTENDED_OUTFILES))
EXTFILTER2 = $(basename $(EXTFILTER1))
EXTFILTER3 = $(basename $(EXTFILTER2))
EXTFILTER4 = $(basename $(EXTFILTER3))
# final filter list
FILTER = $(basename $(EXTFILTER4) $(BASIC_OUTFILES))
# finally, select the test files by filtering against against the
# stripped output files and sort them to remove duplicates.
TESTS = $(sort $(filter $(ALLFILES), $(FILTER)))
tests/btrfs/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/cifs/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/ext4/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/f2fs/Makefile
+2 -2
View File
@@ -13,9 +13,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/generic/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/overlay/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/shared/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/udf/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib:
tests/xfs/Makefile
+2 -2
View File
@@ -12,9 +12,9 @@ include $(BUILDRULES)
install:
$(INSTALL) -m 755 -d $(TARGET_DIR)
$(INSTALL) -m 755 [0-9]?? $(TARGET_DIR)
$(INSTALL) -m 755 $(TESTS) $(TARGET_DIR)
$(INSTALL) -m 644 group $(TARGET_DIR)
$(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR)
$(INSTALL) -m 644 $(OUTFILES) $(TARGET_DIR)
# Nothing.
install-dev install-lib: