Skip to content

Commit 2c01ff5

Browse files
committed
tests: clean makefile to print quiet messages consistenly
Signed-off-by: Waldemar Kozaczuk <jwkozaczuk@gmail.com>
1 parent 337cd2b commit 2c01ff5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/tests/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ $(out)/tests/tst-non-fpic.o: CXXFLAGS:=$(subst -fPIC,-mcmodel=large,$(CXXFLAGS))
6565
$(out)/tests/tst-getopt-pie.o: CXXFLAGS:=$(subst -fPIC,-fpie,$(CXXFLAGS))
6666
$(out)/tests/tst-getopt-pie.o: $(src)/tests/tst-getopt.cc
6767
$(makedir)
68-
$(call quiet, $(CXX) $(CXXFLAGS) -c -o $@ $<, CXX $*.cc)
68+
$(call quiet, $(CXX) $(CXXFLAGS) -c -o $@ $<, CXX tests/tst-getopt-pie.cc)
6969
$(out)/tests/tst-getopt-pie.so: $(out)/tests/tst-getopt-pie.o
70-
$(call quiet, $(CXX) $(CXXFLAGS) -pie -o $@ $< $(LIBS), LD $@)
70+
$(call quiet, $(CXX) $(CXXFLAGS) -pie -o $@ $< $(LIBS), LD tests/tst-getopt-pie.so)
7171

7272
$(out)/tests/tst-non-pie.so: CXXFLAGS:=$(subst -fPIC,-no-pie,$(CXXFLAGS))
7373
$(out)/tests/tst-non-pie.so: $(src)/tests/tst-non-pie.cc
74-
$(call quiet, $(CXX) $(CXXFLAGS) -o $@ $< $(LIBS), LD $@)
74+
$(call quiet, $(CXX) $(CXXFLAGS) -o $@ $< $(LIBS), LD tests/tst-non-pie.so)
7575

7676
# The rofs test image mounts /tmp as ramfs and 4 tests that exercise file system
7777
# fail due to some unresolved bugs or other shortcomings of the ramfs implementation
@@ -150,17 +150,17 @@ $(out)/tests/tst-tls.so: \
150150
$(src)/tests/tst-tls.cc \
151151
$(out)/tests/libtls.so
152152
$(makedir)
153-
$(call quiet, cd $(out); $(CXX) $(CXXFLAGS) -D__SHARED_OBJECT__=1 -shared -o $@ $< tests/libtls.so, CXX tst-tls.so)
153+
$(call quiet, cd $(out); $(CXX) $(CXXFLAGS) -D__SHARED_OBJECT__=1 -shared -o $@ $< tests/libtls.so, CXX tests/tst-tls.cc)
154154

155155
$(out)/tests/tst-tls-pie.o: CXXFLAGS:=$(subst -fPIC,-fpie,$(CXXFLAGS))
156156
$(out)/tests/tst-tls-pie.o: $(src)/tests/tst-tls.cc
157157
$(makedir)
158-
$(call quiet, $(CXX) $(CXXFLAGS) -c -o $@ $<, CXX $*.cc)
158+
$(call quiet, $(CXX) $(CXXFLAGS) -c -o $@ $<, CXX tests/tst-tls-pie.cc)
159159
$(out)/tests/tst-tls-pie.so: \
160160
$(out)/tests/tst-tls-pie.o \
161161
$(out)/tests/libtls.so
162162
$(makedir)
163-
$(call quiet, cd $(out); $(CXX) $(CXXFLAGS) -fuse-ld=bfd -pthread -pie -o $@ $< tests/libtls.so, LD tst-tls-pie.so)
163+
$(call quiet, cd $(out); $(CXX) $(CXXFLAGS) -fuse-ld=bfd -pthread -pie -o $@ $< tests/libtls.so, LD tests/tst-tls-pie.so)
164164

165165
boost-tests := tst-vfs.so tst-libc-locking.so misc-fs-stress.so \
166166
misc-bdev-write.so misc-bdev-wlatency.so misc-bdev-rw.so \

0 commit comments

Comments
 (0)