Browse Source

add g++ checks, separate checks for gcc and g++

Waldemar Brodkorb 12 years ago
parent
commit
0d3d3eb227
2 changed files with 17 additions and 3 deletions
  1. 6 0
      Makefile
  2. 11 3
      mk/build.mk

+ 6 - 0
Makefile

@@ -155,6 +155,12 @@ bulkallmod: .prereq_done
 check: .prereq_done
 	@${GMAKE_INV} check
 
+check-gcc: .prereq_done
+	@${GMAKE_INV} check-gcc
+
+check-g++: .prereq_done
+	@${GMAKE_INV} check-g++
+
 menu: .prereq_done
 	@${GMAKE_INV} menu
 

+ 11 - 3
mk/build.mk

@@ -587,13 +587,21 @@ dep: $(TOPDIR)/bin/tools/depmaker
 
 include $(TOPDIR)/toolchain/gcc/Makefile.inc
 
-check:
-	@-rm tests/adk.exp tests/master.exp
+check-dejagnu:
+	@-rm tests/adk.exp tests/master.exp >/dev/null 2>&1
 	@sed -e "s#@ADK_TARGET_IP@#$(ADK_TARGET_IP)#" tests/adk.exp.in > \
 		tests/adk.exp.in.tmp
 	@sed -e "s#@ADK_TARGET_PORT@#$(ADK_TARGET_PORT)#" tests/adk.exp.in.tmp > \
 		tests/adk.exp
 	@sed -e "s#@TOPDIR@#$(TOPDIR)#" tests/master.exp.in > \
 		tests/master.exp
+
+check-gcc: check-dejagnu
+	env DEJAGNU=$(TOPDIR)/tests/master.exp \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc
+
+check-g++: check-dejagnu
 	env DEJAGNU=$(TOPDIR)/tests/master.exp \
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc RUNTESTFLAGS="execute.exp"
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-g++
+
+check: check-gcc check-g++