diff options
| author | Andreas Dilger <adilger@clusterfs.com> | 2006-08-19 20:05:28 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2006-08-19 20:05:28 -0400 |
| commit | cc6d1a9ef73a1165aa541da0ab856617f7f02fb0 (patch) | |
| tree | ca8f2c66cc49a624ee0a521b583f0e55994b0c00 /lib/blkid | |
| parent | e54635de96a4bea38c7e4e10ae4e6ccbe9472663 (diff) | |
| download | e2fsprogs-cc6d1a9ef73a1165aa541da0ab856617f7f02fb0.tar.gz | |
This patch fixes up an error in the lib/blkid/Makefile.in which was causing
all lib/blkid/tst* files to be removed with "make clean", in particular
tst_types.c. That was causing a failure of "make check" in an RPM source
tree. Fix is to explicitly list the test binaries, as lib/ext2fs/Makefile.in
does.
As "make check" was only calling test_probe and tst_types (and none
of the other tst_* tests) it was not clear what was going on, and an
"hg update" would always return the old tst_types.c file back so the
problem was only being seen intermittently... It isn't clear whether
you want the other tst_* programs to be run as part of "make check".
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Diffstat (limited to 'lib/blkid')
| -rw-r--r-- | lib/blkid/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/blkid/Makefile.in | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index 5a4d5cac..7b8d1ed5 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,8 @@ +2006-08-19 Andreas Dilger <adilger@clusterfs.com> + + * Makefile.in (clean): Avoid removing the tst_*.c files, but + instead list each of the tst_* binaries explicitly. + 2006-05-14 Theodore Tso <tytso@mit.edu> * probe.c (probe_udf): Fix signed vs. unsigned lint warning; diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in index 07b72ac1..bf0012e7 100644 --- a/lib/blkid/Makefile.in +++ b/lib/blkid/Makefile.in @@ -175,7 +175,9 @@ uninstall:: done clean:: - $(RM) -f \#* *.s *.o *.orig *.a *~ *.bak tst_* tests/*.out tests/*.ok \ + $(RM) -f \#* *.s *.o *.orig *.a *~ *.bak tst_cache tst_dev tst_devname \ + tst_devno tst_getsize tst_probe tst_read tst_resolve tst_save \ + tst_tag tst_types tests/*.out tests/*.ok \ tests/*.img results test_probe core profiled/* \ checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \ $(SMANPAGES) blkid |