2007-12-13 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile.am, configure.ac: Add new tests for interrupt disable,
	enable, flash, and is in progress. These are normally inlines but
	also have bodies for non-C code. This test also exercises the odd
	case of calling clock tick from outside an ISR.
	* sp37/.cvsignore, sp37/Makefile.am, sp37/sp37.scn, sp37/system.h: New files.

7 files changed, 89 insertions, 1 deletions

diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog
index 1f0cf8bcfc..88b6a2f8c2 100644
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,5 +1,13 @@
 2007-12-13	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* Makefile.am, configure.ac: Add new tests for interrupt disable,
+	enable, flash, and is in progress. These are normally inlines but
+	also have bodies for non-C code. This test also exercises the odd
+	case of calling clock tick from outside an ISR.
+	* sp37/.cvsignore, sp37/Makefile.am, sp37/sp37.scn, sp37/system.h: New files.
+
+2007-12-13	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* sp07/init.c, sp07/sp07.scn, sp07/task1.c: Add tests for
 	using notepad with the current task's ID or SELF
 	* sp09/screen02.c, sp09/screen04.c, sp09/sp09.scn: Add
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 610003c0da..71f98fbf60 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 ## spfatal is not included for now
 SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \
     sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 sp29 \
-    sp30 sp31 sp32 sp33 sp34 sp35 spsize 
+    sp30 sp31 sp32 sp33 sp34 sp35 sp37 spsize 
 DIST_SUBDIRS = $(SUBDIRS) spfatal
 
 include $(top_srcdir)/../automake/subdirs.am
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 61f7270707..706bdb30f1 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -60,6 +60,7 @@ sp32/Makefile
 sp33/Makefile
 sp34/Makefile
 sp35/Makefile
+sp37/Makefile
 spsize/Makefile
 spfatal/Makefile
 ])
diff --git a/testsuites/sptests/sp37/.cvsignore b/testsuites/sptests/sp37/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/sptests/sp37/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/sptests/sp37/Makefile.am b/testsuites/sptests/sp37/Makefile.am
new file mode 100644
index 0000000000..00c14fa497
--- /dev/null
+++ b/testsuites/sptests/sp37/Makefile.am
@@ -0,0 +1,27 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = sp37.exe
+sp37_exe_SOURCES = init.c system.h
+
+dist_rtems_tests_DATA = sp37.scn
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+sp37_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(sp37_exe_OBJECTS) $(sp37_exe_LDADD)
+LINK_LIBS = $(sp37_exe_LDLIBS)
+
+sp37.exe$(EXEEXT): $(sp37_exe_OBJECTS) $(sp37_exe_DEPENDENCIES)
+	@rm -f sp37.exe$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp37/sp37.scn b/testsuites/sptests/sp37/sp37.scn
new file mode 100644
index 0000000000..adb85057b7
--- /dev/null
+++ b/testsuites/sptests/sp37/sp37.scn
@@ -0,0 +1,14 @@
+*** TEST 37 ***
+clock_tick from task level
+interrupt is in progress (use body)
+interrupt disable (use inline)
+interrupt flash (use inline)
+interrupt enable (use inline)
+interrupt is in progress (use body)
+interrupt disable (use body)
+interrupt disable (use body)
+interrupt flash (use body)
+interrupt enable (use body)
+isr_in_progress(inline) from ISR -- OK
+isr_in_progress(body) from ISR -- OK
+*** END OF TEST 37 ***
diff --git a/testsuites/sptests/sp37/system.h b/testsuites/sptests/sp37/system.h
new file mode 100644
index 0000000000..84b7ab8614
--- /dev/null
+++ b/testsuites/sptests/sp37/system.h
@@ -0,0 +1,36 @@
+/*  system.h
+ *
+ *  This include file contains information that is included in every
+ *  function in the test set.
+ *
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#include <tmacros.h>
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_MAXIMUM_TIMERS            1
+
+#include <rtems/confdefs.h>
+
+/* end of include file */