summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2011-11-23 14:56:47 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2011-11-23 14:56:47 +0000
commit8d7da8864e6e9dac1853dd6f7107b6b527350001 (patch)
tree4d94f9d4dce9dbb69c0e002b821814325bad3dcf
parent9fb16c608d4cd345a1d127966497fba8c85d9c9f (diff)
downloadlvm2-8d7da8864e6e9dac1853dd6f7107b6b527350001.tar.gz
lvm2-8d7da8864e6e9dac1853dd6f7107b6b527350001.tar.xz
lvm2-8d7da8864e6e9dac1853dd6f7107b6b527350001.zip
Cleanup files from testing
Cleanup generated files from coverage testing. Do not skip standard .o compilation for lib/not and lib/harness. Make a bit longer string in harness to fit new shell/ in.
-rw-r--r--test/Makefile.in5
-rw-r--r--test/api/Makefile.in1
-rw-r--r--test/lib/harness.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 0576d2af..c264e5fb 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -25,6 +25,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
SUBDIRS = api unit
+SOURCES = lib/not.c lib/harness.c
include $(top_builddir)/make.tmpl
@@ -61,8 +62,8 @@ check_local: .tests-stamp
lib/should: lib/not
ln -sf not lib/should
-lib/%: $(srcdir)/lib/%.c .lib-dir-stamp
- $(CC) $(DEFS) $(CFLAGS) -o $@ $<
+lib/%: lib/%.o .lib-dir-stamp
+ $(CC) $(LDFLAGS) -o $@ $<
lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp
cp $< $@
diff --git a/test/api/Makefile.in b/test/api/Makefile.in
index 8aa0b15c..324d00b1 100644
--- a/test/api/Makefile.in
+++ b/test/api/Makefile.in
@@ -21,6 +21,7 @@ TARGETS += test
SOURCES = test.c
TARGETS += vgtest.t percent.t pe_start.t
+SOURCES2 = vgtest.c percent.c pe_start.c
endif
include $(top_builddir)/make.tmpl
diff --git a/test/lib/harness.c b/test/lib/harness.c
index f1300d7a..43975be5 100644
--- a/test/lib/harness.c
+++ b/test/lib/harness.c
@@ -208,7 +208,7 @@ static void run(int i, char *f) {
char buf[128];
snprintf(buf, 128, "%s ...", f);
buf[127] = 0;
- printf("Running %-40s ", buf);
+ printf("Running %-50s ", buf);
fflush(stdout);
while ((w = waitpid(pid, &st, WNOHANG)) == 0) {
drain();