From 13c158130dad8c0672aa3e4fea7d1c248b25accb Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 29 Dec 2016 11:47:09 -0600
Subject: [PATCH] OS test: Was ignoring CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE

---
 examples/ostest/Makefile      | 2 ++
 examples/ostest/ostest_main.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile
index f5f5b1a43..1525f1cd9 100644
--- a/examples/ostest/Makefile
+++ b/examples/ostest/Makefile
@@ -48,8 +48,10 @@ CSRCS = dev_null.c restart.c
 MAINSRC = ostest_main.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
+ifneq ($(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE),y)
 CSRCS += fpu.c
 endif
+endif
 
 ifeq ($(CONFIG_TLS),y)
 CSRCS += tls.c
diff --git a/examples/ostest/ostest_main.c b/examples/ostest/ostest_main.c
index 081364043..5f9dcee48 100644
--- a/examples/ostest/ostest_main.c
+++ b/examples/ostest/ostest_main.c
@@ -347,7 +347,7 @@ static int user_main(int argc, char *argv[])
       check_test_memory_usage();
 #endif
 
-#ifdef  CONFIG_ARCH_FPU
+#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE)
       /* Check that the FPU is properly supported during context switching */
 
       printf("\nuser_main: FPU test\n");