From 0be83c09a066119f5fded3bd1344f90a0a98d52c Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Wed, 21 Oct 2015 14:50:00 -0600
Subject: 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>
---
 util/cbmem/Makefile | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'util/cbmem')

diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index 91bb0456fb..41079b01bb 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -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 $@
-- 
cgit v1.2.3