| Message ID | 1467212275-14344-1-git-send-email-jtulak@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 29, 2016 at 04:57:55PM +0200, Jan Tulak wrote: > 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 directories. > > Signed-off-by: Jan Tulak <jtulak@redhat.com> Thanks for fixing it! But this breaks installation in other subdirs # make install ... ../../install-sh -o root -g root -m 755 [0-9]??-* /var/lib/xfstests/tests/btrfs cp: cannot stat ‘[0-9]??-*’: No such file or directory gmake[2]: *** [install] Error 1 gmake[1]: *** [/root/xfstests/tests/btrfs/-install] Error 2 make: *** [tests-install] Error 2 Thanks, Eryu -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 30, 2016 at 5:38 AM, Eryu Guan <eguan@redhat.com> wrote: > On Wed, Jun 29, 2016 at 04:57:55PM +0200, Jan Tulak wrote: >> 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 directories. >> >> Signed-off-by: Jan Tulak <jtulak@redhat.com> > > Thanks for fixing it! But this breaks installation in other subdirs > > # make install > ... > ../../install-sh -o root -g root -m 755 [0-9]??-* /var/lib/xfstests/tests/btrfs > cp: cannot stat ‘[0-9]??-*’: No such file or directory > gmake[2]: *** [install] Error 1 > gmake[1]: *** [/root/xfstests/tests/btrfs/-install] Error 2 > make: *** [tests-install] Error 2 > Hmm, yeah, I see... It fails when there is no such file to install. I'm making it to ignore the error in the way: -$(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) 2>/dev/null;true It might hide some other issues (permissions...), but the chances are, if something goes wrong, it goes wrong also with the standard three-digit-names, where the error is not suppressed. Thanks, Jan
On Thu, Jun 30, 2016 at 6:06 PM, Jan Tulak <jtulak@redhat.com> wrote: > 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/xfs/. > > This change will have to be repeated later for other directories, as adding it > now everywhere would cause make install to fail if no such extended name is > present in the dir. > > Signed-off-by: Jan Tulak <jtulak@redhat.com> > --- > UPDATE: > Let it be just in tests/xfs/. > > NOTE: if tested without at first merging my 400-input-valiation test, make > install will fail again. :-) > > Signed-off-by: Jan Tulak <jtulak@redhat.com> > --- > tests/xfs/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile > index db94be0..e9b98a3 100644 > --- a/tests/xfs/Makefile > +++ b/tests/xfs/Makefile > @@ -13,8 +13,10 @@ include $(BUILDRULES) > install: > $(INSTALL) -m 755 -d $(TARGET_DIR) > $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) > + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) > $(INSTALL) -m 644 group $(TARGET_DIR) > $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) > + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) > > # Nothing. > install-dev install-lib: > -- > 2.5.5 > Ah, I'm sorry, I cut "names" from $SUBJ. Should be "Extended names", but I think it is not worth of a fixing patch... Thanks, Jan
On Thu, Jun 30, 2016 at 06:08:09PM +0200, Jan Tulak wrote: > On Thu, Jun 30, 2016 at 6:06 PM, Jan Tulak <jtulak@redhat.com> wrote: > > 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/xfs/. > > > > This change will have to be repeated later for other directories, as adding it > > now everywhere would cause make install to fail if no such extended name is > > present in the dir. > > > > Signed-off-by: Jan Tulak <jtulak@redhat.com> > > --- > > UPDATE: > > Let it be just in tests/xfs/. > > > > NOTE: if tested without at first merging my 400-input-valiation test, make > > install will fail again. :-) > > > > Signed-off-by: Jan Tulak <jtulak@redhat.com> > > --- > > tests/xfs/Makefile | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile > > index db94be0..e9b98a3 100644 > > --- a/tests/xfs/Makefile > > +++ b/tests/xfs/Makefile > > @@ -13,8 +13,10 @@ include $(BUILDRULES) > > install: > > $(INSTALL) -m 755 -d $(TARGET_DIR) > > $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) > > + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) > > $(INSTALL) -m 644 group $(TARGET_DIR) > > $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) > > + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) > > > > # Nothing. > > install-dev install-lib: > > -- > > 2.5.5 > > > > Ah, I'm sorry, I cut "names" from $SUBJ. Should be "Extended names", > but I think it is not worth of a fixing patch... I queued it up with the summary fixed :) Eryu -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/btrfs/Makefile b/tests/btrfs/Makefile index e1a5be1..074204c 100644 --- a/tests/btrfs/Makefile +++ b/tests/btrfs/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/cifs/Makefile b/tests/cifs/Makefile index 9176e5c..f6bff4f 100644 --- a/tests/cifs/Makefile +++ b/tests/cifs/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/ext4/Makefile b/tests/ext4/Makefile index 7a3c8e1..f7056a0 100644 --- a/tests/ext4/Makefile +++ b/tests/ext4/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/f2fs/Makefile b/tests/f2fs/Makefile index 4d00e9e..0805348 100644 --- a/tests/f2fs/Makefile +++ b/tests/f2fs/Makefile @@ -14,8 +14,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/generic/Makefile b/tests/generic/Makefile index 9529fb8..b90d6c9 100644 --- a/tests/generic/Makefile +++ b/tests/generic/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/overlay/Makefile b/tests/overlay/Makefile index 63c9878..3bc3a9b 100644 --- a/tests/overlay/Makefile +++ b/tests/overlay/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/shared/Makefile b/tests/shared/Makefile index cbd87f9..3854783 100644 --- a/tests/shared/Makefile +++ b/tests/shared/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/udf/Makefile b/tests/udf/Makefile index 1d96658..6f23935 100644 --- a/tests/udf/Makefile +++ b/tests/udf/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib: diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile index db94be0..e9b98a3 100644 --- a/tests/xfs/Makefile +++ b/tests/xfs/Makefile @@ -13,8 +13,10 @@ include $(BUILDRULES) install: $(INSTALL) -m 755 -d $(TARGET_DIR) $(INSTALL) -m 755 [0-9]?? $(TARGET_DIR) + $(INSTALL) -m 755 [0-9]??-* $(TARGET_DIR) $(INSTALL) -m 644 group $(TARGET_DIR) $(INSTALL) -m 644 [0-9]??.* $(TARGET_DIR) + $(INSTALL) -m 644 [0-9]??-*.* $(TARGET_DIR) # Nothing. install-dev install-lib:
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 directories. Signed-off-by: Jan Tulak <jtulak@redhat.com> --- tests/btrfs/Makefile | 2 ++ tests/cifs/Makefile | 2 ++ tests/ext4/Makefile | 2 ++ tests/f2fs/Makefile | 2 ++ tests/generic/Makefile | 2 ++ tests/overlay/Makefile | 2 ++ tests/shared/Makefile | 2 ++ tests/udf/Makefile | 2 ++ tests/xfs/Makefile | 2 ++ 9 files changed, 18 insertions(+)