summaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-14 08:19:46 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-14 08:19:46 -0600
commitbb1d597d3bbb2f5823d7e15ce8495495d4c79a78 (patch)
treeaed7cc91a0620b4649e010d3416b1388a0fc525a /apps/examples
parent26d0141f155734ffdaad2260d9335061fe81abc1 (diff)
downloadpx4-nuttx-bb1d597d3bbb2f5823d7e15ce8495495d4c79a78.tar.gz
px4-nuttx-bb1d597d3bbb2f5823d7e15ce8495495d4c79a78.tar.bz2
px4-nuttx-bb1d597d3bbb2f5823d7e15ce8495495d4c79a78.zip
Do not build test cases that use task_create is there is an address environment
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/elf/tests/Makefile8
-rw-r--r--apps/examples/nxflat/tests/Makefile12
2 files changed, 16 insertions, 4 deletions
diff --git a/apps/examples/elf/tests/Makefile b/apps/examples/elf/tests/Makefile
index 17732c775..84e0e322e 100644
--- a/apps/examples/elf/tests/Makefile
+++ b/apps/examples/elf/tests/Makefile
@@ -1,7 +1,7 @@
############################################################################
# apps/examples/elf/tests/Makefile
#
-# Copyright (C) 2012 Gregory Nutt. All rights reserved.
+# Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
include $(APPDIR)/Make.defs
ALL_SUBDIRS = errno hello helloxx longjmp mutex pthread signal task struct
-BUILD_SUBDIRS = errno hello task struct
+BUILD_SUBDIRS = errno hello struct
ifeq ($(CONFIG_HAVE_CXX),y)
BUILD_SUBDIRS += helloxx
@@ -56,6 +56,10 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
BUILD_SUBDIRS += signal
endif
+ifneq ($(CONFIG_ARCH_ADDRENV),y)
+BUILD_SUBDIRS += task
+endif
+
ELF_DIR = $(APPDIR)/examples/elf
TESTS_DIR = $(ELF_DIR)/tests
ROMFS_DIR = $(TESTS_DIR)/romfs
diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile
index 8a65d6494..265ac27c1 100644
--- a/apps/examples/nxflat/tests/Makefile
+++ b/apps/examples/nxflat/tests/Makefile
@@ -1,7 +1,7 @@
############################################################################
# apps/examples/nxflat/tests/Makefile
#
-# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+# Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,15 @@
# Most of these do no build yet
#SUBDIRS = errno hello hello++ longjmp mutex pthread signal task struct
-SUBDIRS = errno hello mutex pthread task struct
+SUBDIRS = errno hello struct
+
+ifneq ($(CONFIG_DISABLE_PTHREAD),y)
+BUILD_SUBDIRS += mutex pthread
+endif
+
+ifneq ($(CONFIG_ARCH_ADDRENV),y)
+BUILD_SUBDIRS += task
+endif
NXFLAT_DIR = $(APPDIR)/examples/nxflat
TESTS_DIR = $(NXFLAT_DIR)/tests