2010-07-19 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, configure.ac: Add tar test for error cases.
	* tar03/.cvsignore, tar03/Makefile.am, tar03/init.c, tar03/tar03.doc,
	tar03/tar03.scn: New files.

5 files changed, 120 insertions, 0 deletions

diff --git a/testsuites/libtests/tar03/.cvsignore b/testsuites/libtests/tar03/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/libtests/tar03/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/libtests/tar03/Makefile.am b/testsuites/libtests/tar03/Makefile.am
new file mode 100644
index 0000000000..5471bbd5e6
--- /dev/null
+++ b/testsuites/libtests/tar03/Makefile.am
@@ -0,0 +1,26 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = tar03
+tar03_SOURCES = init.c
+
+dist_rtems_tests_DATA = tar03.scn
+dist_rtems_tests_DATA += tar03.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(tar03_OBJECTS) $(tar03_LDADD)
+LINK_LIBS = $(tar03_LDLIBS)
+
+tar03$(EXEEXT): $(tar03_OBJECTS) $(tar03_DEPENDENCIES)
+	@rm -f tar03$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tar03/init.c b/testsuites/libtests/tar03/init.c
new file mode 100644
index 0000000000..d0dacbbca1
--- /dev/null
+++ b/testsuites/libtests/tar03/init.c
@@ -0,0 +1,62 @@
+/*
+ *  COPYRIGHT (c) 1989-2010.
+ *  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>
+#include "test_support.h"
+
+#include <rtems/imfs.h>
+#include <rtems/untar.h>
+#include <rtems/error.h>
+
+void test_tarfs_error(void)
+{
+  int sc;
+
+  puts("Loading tarfs image at non-root - ERROR");
+  sc = rtems_tarfs_load("x",(void *)rtems_task_create, 72);
+  if (sc != -1) {
+    printf ("error: untar failed returned %d\n", sc);
+    rtems_test_exit(1);
+  }
+
+  puts("Loading tarfs image with miniIMFS as root filesystem - ERROR");
+  sc = rtems_tarfs_load("/",(void *)rtems_task_create, 72);
+  if (sc != -1) {
+    printf ("error: untar failed returned %d\n", sc);
+    rtems_test_exit(1);
+  }
+}
+
+rtems_task Init(
+  rtems_task_argument argument
+)
+{
+  puts( "\n\n*** TEST TAR03 ***" );
+
+  test_tarfs_error();
+  
+  puts( "*** END OF TEST TAR03 ***" );
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/libtests/tar03/tar03.doc b/testsuites/libtests/tar03/tar03.doc
new file mode 100644
index 0000000000..b706026e12
--- /dev/null
+++ b/testsuites/libtests/tar03/tar03.doc
@@ -0,0 +1,26 @@
+#
+#  $Id$
+#
+#  COPYRIGHT (c) 1989-2010.
+#  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.
+#
+
+This file describes the directives and concepts tested by this test set.
+
+test set name:  tar03
+
+directives:
+
+  rtems_tarfs_load
+
+concepts:
+
++ Exercise error path for loading image at non-root directory
+
++ Exercise error path when root filesytem does not support files
+
+
diff --git a/testsuites/libtests/tar03/tar03.scn b/testsuites/libtests/tar03/tar03.scn
new file mode 100644
index 0000000000..6bbc06c37b
--- /dev/null
+++ b/testsuites/libtests/tar03/tar03.scn
@@ -0,0 +1,4 @@
+*** TEST TAR03 ***
+Loading tarfs image at non-root - ERROR
+Loading tarfs image with miniIMFS as root filesystem - ERROR
+*** END OF TEST TAR03 ***