summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-17 18:13:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-17 18:13:41 +0000
commit7dbdc9876422d675e06c4e43d2a186c1c07ecd63 (patch)
treebaf813e082e3acae20c8268f988d5da1b04fb07b
parent2009-09-17 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadada-examples-7dbdc9876422d675e06c4e43d2a186c1c07ecd63.tar.bz2
2009-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.shared, networkconfig-qemu.h, cpuuse/Makefile, empty/Makefile, empty/empty.adb, exception_test2/Makefile, exception_test2/exceptiontest2.adb, exception_test3/Makefile, exception_test3/exceptiontest3.adb, hello_via_task/Makefile, hello_via_task/hello.adb, irq_test_c/Makefile: Make follow standard RTEMS test output format. Add output screens where appropriate. * exception_test2/exception_test2.scn, exception_test3/exception_test3.scn, hello_via_task/hello_via_task.scn: New files.
-rw-r--r--ChangeLog12
-rw-r--r--Makefile.shared2
-rw-r--r--cpuuse/Makefile2
-rw-r--r--empty/Makefile4
-rw-r--r--empty/empty.adb7
-rw-r--r--exception_test2/Makefile5
-rw-r--r--exception_test2/exception_test2.scn3
-rw-r--r--exception_test2/exceptiontest2.adb7
-rw-r--r--exception_test3/Makefile4
-rw-r--r--exception_test3/exception_test3.scn3
-rw-r--r--exception_test3/exceptiontest3.adb7
-rw-r--r--hello_via_task/Makefile2
-rw-r--r--hello_via_task/hello.adb3
-rw-r--r--hello_via_task/hello_via_task.scn7
-rw-r--r--irq_test_c/Makefile6
-rw-r--r--networkconfig-qemu.h4
16 files changed, 65 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index ecd69cc..8a15ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2009-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * Makefile.shared, networkconfig-qemu.h, cpuuse/Makefile,
+ empty/Makefile, empty/empty.adb, exception_test2/Makefile,
+ exception_test2/exceptiontest2.adb, exception_test3/Makefile,
+ exception_test3/exceptiontest3.adb, hello_via_task/Makefile,
+ hello_via_task/hello.adb, irq_test_c/Makefile: Make follow standard
+ RTEMS test output format. Add output screens where appropriate.
+ * exception_test2/exception_test2.scn,
+ exception_test3/exception_test3.scn,
+ hello_via_task/hello_via_task.scn: New files.
+
+2009-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* Makefile.shared, hello_via_task/hello.adb: Make follow standard RTEMS
test output format.
diff --git a/Makefile.shared b/Makefile.shared
index fff4ac6..98ec460 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,6 +1,8 @@
#
# Subdirectory makefiles do some setup, then we get here
#
+# $Id$
+#
# Tool helpers
SPECFLAGS =-B${RTEMS_MAKEFILE_PATH}/lib/ -specs=bsp_specs -qrtems
diff --git a/cpuuse/Makefile b/cpuuse/Makefile
index e00b2a4..36b7dd4 100644
--- a/cpuuse/Makefile
+++ b/cpuuse/Makefile
@@ -3,6 +3,8 @@
#
# See README.Makefiles in the main ada-examples directory.
#
+# $Id$
+#
PROGRAM=cpuuse
diff --git a/empty/Makefile b/empty/Makefile
index be160ba..0906178 100644
--- a/empty/Makefile
+++ b/empty/Makefile
@@ -1,8 +1,10 @@
#
-# Makefile for Ada Dump URL example
+# Makefile for Empty Ada program example
#
# See README.Makefiles in the main ada-examples directory.
#
+# $Id$
+#
PROGRAM=empty
diff --git a/empty/empty.adb b/empty/empty.adb
index b811fe6..67c5404 100644
--- a/empty/empty.adb
+++ b/empty/empty.adb
@@ -1,11 +1,8 @@
--
---
--- 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.
---
-- Null Main Program
--
+-- $Id$
+--
procedure Empty is
begin
diff --git a/exception_test2/Makefile b/exception_test2/Makefile
index faa9f1d..0bd57a6 100644
--- a/exception_test2/Makefile
+++ b/exception_test2/Makefile
@@ -1,7 +1,12 @@
#
+# Exception Test #3
+#
+# $Id$
+#
# See README.Makefiles in the main ada-examples directory.
#
+
PROGRAM=exceptiontest2
include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
diff --git a/exception_test2/exception_test2.scn b/exception_test2/exception_test2.scn
new file mode 100644
index 0000000..ebbf74c
--- /dev/null
+++ b/exception_test2/exception_test2.scn
@@ -0,0 +1,3 @@
+*** Exception Test 2 ***
+Caught Constraint_Error -- inner
+*** END OF Exception Test 2 ***
diff --git a/exception_test2/exceptiontest2.adb b/exception_test2/exceptiontest2.adb
index 822ee1a..337d571 100644
--- a/exception_test2/exceptiontest2.adb
+++ b/exception_test2/exceptiontest2.adb
@@ -1,9 +1,13 @@
---BEGIN exceptiontest2.adb
+--
+-- $Id$
+--
+
with Ada.Text_IO; use Ada.Text_IO;
procedure ExceptionTest2 is
function F return Boolean is
begin
+ Put_Line ("*** Exception Test 2 ***");
raise Constraint_Error;
return True;
end F;
@@ -17,6 +21,7 @@ begin
exception
when others =>
Put_Line ("Caught Constraint_Error -- inner");
+ Put_Line ("*** END OF Exception Test 2 ***");
end;
exception
when others =>
diff --git a/exception_test3/Makefile b/exception_test3/Makefile
index 9eb4917..6936eda 100644
--- a/exception_test3/Makefile
+++ b/exception_test3/Makefile
@@ -1,4 +1,8 @@
#
+# Exception Test #3
+#
+# $Id$
+#
# See README.Makefiles in the main ada-examples directory.
#
diff --git a/exception_test3/exception_test3.scn b/exception_test3/exception_test3.scn
new file mode 100644
index 0000000..23e3b2c
--- /dev/null
+++ b/exception_test3/exception_test3.scn
@@ -0,0 +1,3 @@
+*** Exception Test 3 ***
+Caught Constraint_Error -- inner
+*** END OF Exception Test 3 ***
diff --git a/exception_test3/exceptiontest3.adb b/exception_test3/exceptiontest3.adb
index be4bd1b..3711008 100644
--- a/exception_test3/exceptiontest3.adb
+++ b/exception_test3/exceptiontest3.adb
@@ -1,9 +1,13 @@
---BEGIN exceptiontest3.adb
+--
+-- $Id$
+--
+
with Ada.Text_IO; use Ada.Text_IO;
procedure ExceptionTest3 is
function F return Boolean is
begin
+ Put_Line ("*** Exception Test 3 ***");
raise Constraint_Error;
return True;
end F;
@@ -17,6 +21,7 @@ begin
exception
when Constraint_Error =>
Put_Line ("Caught Constraint_Error -- inner");
+ Put_Line ("*** END OF Exception Test 3 ***");
when others =>
Put_Line ("not ok wrong exception");
end;
diff --git a/hello_via_task/Makefile b/hello_via_task/Makefile
index 8602dcb..2fbd56c 100644
--- a/hello_via_task/Makefile
+++ b/hello_via_task/Makefile
@@ -3,6 +3,8 @@
#
# See README.Makefiles in the main ada-examples directory.
#
+# $Id$
+#
PROGRAM=hello
diff --git a/hello_via_task/hello.adb b/hello_via_task/hello.adb
index 4b50b38..ed73dcb 100644
--- a/hello_via_task/hello.adb
+++ b/hello_via_task/hello.adb
@@ -1,6 +1,9 @@
--
-- Hello World Using a Task
--
+-- $Id$
+--
+
with Text_IO; use Text_IO;
diff --git a/hello_via_task/hello_via_task.scn b/hello_via_task/hello_via_task.scn
new file mode 100644
index 0000000..fba9905
--- /dev/null
+++ b/hello_via_task/hello_via_task.scn
@@ -0,0 +1,7 @@
+*** GNAT/RTEMS Hello World Test ***
+
+Welcome to the World of Lady Ada
+
+Initiating 2.5 second delay
+Delay Complete
+*** END OF GNAT/RTEMS Hello World Test ***
diff --git a/irq_test_c/Makefile b/irq_test_c/Makefile
index 1765cc6..966a7f6 100644
--- a/irq_test_c/Makefile
+++ b/irq_test_c/Makefile
@@ -1,9 +1,9 @@
#
-# Makefile
+# Ada IRQ Test (ERC32 Only)
#
-
+# See README.Makefiles in the main ada-examples directory.
#
-# RTEMS_MAKEFILE_PATH is typically set in an environment variable
+# $Id$
#
PGM=${ARCH}/c_irq_text.exe
diff --git a/networkconfig-qemu.h b/networkconfig-qemu.h
index 426da4d..0a4e899 100644
--- a/networkconfig-qemu.h
+++ b/networkconfig-qemu.h
@@ -3,7 +3,7 @@
*
************************************************************
* EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION *
- * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
+ * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
************************************************************
*
* The dynamic probing is based upon the EPICS network
@@ -12,7 +12,7 @@
* eric.norum@usask.ca
* (306) 966-5394
*
- * networkconfig.h,v 1.8 2001/08/31 18:11:43 joel Exp
+ * $Id$
*/
#ifndef _RTEMS_NETWORKCONFIG_H_