summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-31 18:17:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-31 18:17:07 +0200
commit0d3d3eb227d0b0c26e40cbb08a8e57ef80e390c1 (patch)
treec65885e3875b1e1d169b8bf8e0e2ce6e4078b17e
parente6c5a9a53dd6ba112cfe0c05f4c1c5acae3d9999 (diff)
add g++ checks, separate checks for gcc and g++
-rw-r--r--Makefile6
-rw-r--r--mk/build.mk14
2 files changed, 17 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b143098c4..590c0dac2 100644
--- a/Makefile
+++ b/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
diff --git a/mk/build.mk b/mk/build.mk
index c8fa47387..6f52bb868 100644
--- a/mk/build.mk
+++ b/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++