util: Update makefiles for junit testing
- Have clean remove junit.xml files. - Remove junit.xml target from cbmem makefile - this is in the top level Makefile.inc now. - add distclean targets to makefiles. - Make sure all makefiles have .PHONY set up. - rm commands need -f or they will fail if the file they're trying to remove doesn't exist, causing the build to fail. Change-Id: I2f0635f2c0a9417e3377a90c8d67103323c4a72f Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: http://review.coreboot.org/12120 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
535452d154
commit
0be83c09a0
|
@ -31,7 +31,7 @@ all: $(PROGRAM)
|
|||
$(PROGRAM): $(OBJS)
|
||||
|
||||
clean:
|
||||
rm -f $(PROGRAM) *.o *~
|
||||
rm -f $(PROGRAM) *.o *~ junit.xml
|
||||
|
||||
distclean: clean
|
||||
rm -f .dependencies
|
||||
|
@ -43,20 +43,3 @@ distclean: clean
|
|||
|
||||
-include .dependencies
|
||||
|
||||
junit.xml:
|
||||
echo '<?xml version="1.0" encoding="utf-8"?><testsuite>' > $@.tmp
|
||||
$(MAKE) clean; \
|
||||
echo "<testcase classname='cbmem' name='cbmem'>" >> $@.tmp; \
|
||||
$(MAKE) >> $@.tmp.2 2>&1 && type="system-out" || type="failure"; \
|
||||
if [ $$type = "failure" ]; then \
|
||||
echo "<failure type='buildFailed'>" >> $@.tmp; \
|
||||
else \
|
||||
echo "<$$type>" >> $@.tmp; \
|
||||
fi; \
|
||||
echo '<![CDATA[' >> $@.tmp; \
|
||||
cat $@.tmp.2 >> $@.tmp; \
|
||||
echo "]]></$$type>" >>$@.tmp; \
|
||||
rm -f $@.tmp.2; \
|
||||
echo "</testcase>" >> $@.tmp; \
|
||||
echo "</testsuite>" >> $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
|
|
@ -38,7 +38,11 @@ install: $(PROGRAM)
|
|||
$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
|
||||
|
||||
clean:
|
||||
rm *.o $(PROGRAM)
|
||||
rm -f *.o $(PROGRAM) junit.xml
|
||||
|
||||
distclean: clean
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CFLAGS) -c $^ -I. -o $@
|
||||
|
||||
.PHONY: all install clean distclean
|
||||
|
|
|
@ -45,7 +45,7 @@ $(PROGRAM): $(OBJS)
|
|||
$(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
|
||||
|
||||
clean:
|
||||
rm -f $(PROGRAM) *.o *~
|
||||
rm -f $(PROGRAM) *.o *~ junit.xml
|
||||
|
||||
distclean: clean
|
||||
rm -f .dependencies
|
||||
|
|
|
@ -54,7 +54,7 @@ $(PROGRAM): $(OBJS)
|
|||
$(STRIP) $(STRIP_ARGS) $(PROGRAM)
|
||||
|
||||
clean:
|
||||
rm -f $(PROGRAM) $(OBJS)
|
||||
rm -f $(PROGRAM) $(OBJS) junit.xml
|
||||
|
||||
distclean: clean
|
||||
rm -f .dependencies
|
||||
|
|
|
@ -73,6 +73,8 @@ install: $(PROGRAM)
|
|||
$(INSTALL) -p -m644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
|
||||
|
||||
clean:
|
||||
rm -f $(PROGRAM) *.o
|
||||
rm -f $(PROGRAM) *.o junit.xml
|
||||
|
||||
.PHONY: all install clean
|
||||
distclean: clean
|
||||
|
||||
.PHONY: all install clean distclean
|
||||
|
|
|
@ -55,6 +55,7 @@ clean:
|
|||
rm -f $(PROGRAM) $(OBJS)
|
||||
# Remove backup files created by some editors
|
||||
find ./ |grep *~ |xargs rm -f
|
||||
rm -f junit.xml
|
||||
|
||||
distclean: clean
|
||||
rm -f .dependencies
|
||||
|
|
Loading…
Reference in New Issue