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

	PR 1532/testing
	* Makefile.am, configure.ac: Add initial tests for untar capabilities.
	* tar01/.cvsignore, tar01/Makefile.am, tar01/init.c, tar01/tar01.doc,
	tar01/tar01.scn, tar02/.cvsignore, tar02/Makefile.am, tar02/init.c,
	tar02/tar02.doc, tar02/tar02.scn: New files.

13 files changed, 401 insertions, 1 deletions

diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog
index d6f7175a0f..ca7c51d1a3 100644
--- a/testsuites/libtests/ChangeLog
+++ b/testsuites/libtests/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-27	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1532/testing
+	* Makefile.am, configure.ac: Add initial tests for untar capabilities.
+	* tar01/.cvsignore, tar01/Makefile.am, tar01/init.c, tar01/tar01.doc,
+	tar01/tar01.scn, tar02/.cvsignore, tar02/Makefile.am, tar02/init.c,
+	tar02/tar02.doc, tar02/tar02.scn: New files.
+
 2010-07-27	Bharath Suri <bharath.s.jois@gmail.com>
 
 	PR 1631/testing
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 7deac6b08c..9d2e706a12 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS += bspcmdline01 cpuuse devfs01 devfs02 devfs03 devfs04 \
     termios06 termios07 termios08 \
     rtems++ tztest block01 block02 block03 block04 block05 block06 block07 \
     block08 block09 block10 stringto01 \
-    tar03
+    tar01 tar02 tar03
 
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 1e5cc9822c..42b780e650 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -66,6 +66,8 @@ rtmonuse/Makefile
 stackchk/Makefile
 stackchk01/Makefile
 stringto01/Makefile
+tar01/Makefile
+tar02/Makefile
 tar03/Makefile
 termios/Makefile
 termios01/Makefile
diff --git a/testsuites/libtests/tar01/.cvsignore b/testsuites/libtests/tar01/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/libtests/tar01/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/libtests/tar01/Makefile.am b/testsuites/libtests/tar01/Makefile.am
new file mode 100644
index 0000000000..8d1f567089
--- /dev/null
+++ b/testsuites/libtests/tar01/Makefile.am
@@ -0,0 +1,54 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = tar01
+tar01_SOURCES = init.c ../../psxtests/psxfile01/test_cat.c \
+  initial_filesystem_tar.c
+
+dist_rtems_tests_DATA = tar01.scn
+
+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)/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
+
+LINK_OBJS = $(tar01_OBJECTS) $(tar01_LDADD)
+LINK_LIBS = $(tar01_LDLIBS)
+
+tar01$(EXEEXT): stamp-filesystem stamp-initial-fs-source $(tar01_OBJECTS) \
+    $(tar01_DEPENDENCIES)
+	@rm -f tar01$(EXEEXT)
+	$(make-exe)
+
+init.o: init.c stamp-initial-fs-source
+
+initial_filesystem_tar.c: stamp-initial-fs-source
+
+initial_filesystem_tar.h: stamp-initial-fs-source
+
+stamp-initial-fs-source: initial_filesystem.tar
+	$(BIN2C) initial_filesystem.tar initial_filesystem_tar
+	touch stamp-initial-fs-source
+
+stamp-filesystem:
+	rm -rf initial_fs
+	mkdir initial_fs
+	mkdir initial_fs/home
+	(echo "This is a test of loading an RTEMS filesystem from an" ; \
+	echo "initial tar image.") >initial_fs/home/test_file
+	cd initial_fs && ln -s home/test_file symlink
+	touch stamp-filesystem
+
+initial_filesystem.tar: stamp-filesystem
+	cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink
+
+CLEANFILES = initial_fs initial_filesystem* stamp-filesystem \
+	    stamp-initial-fs-source
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c
new file mode 100644
index 0000000000..6abeb05287
--- /dev/null
+++ b/testsuites/libtests/tar01/init.c
@@ -0,0 +1,122 @@
+/*
+ *  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 <bsp.h> /* for device driver prototypes */
+#include "tmacros.h"
+#include <rtems/untar.h>
+#include <rtems/error.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "initial_filesystem_tar.h"
+
+#define TARFILE_START initial_filesystem_tar
+#define TARFILE_SIZE  initial_filesystem_tar_size
+
+void test_cat(
+  char *file,
+  int   offset_arg,
+  int   length
+);
+
+void test_untar_from_memory(void)
+{
+  rtems_status_code sc;
+
+  printf("Untaring from memory - ");
+  sc = Untar_FromMemory((void *)TARFILE_START, TARFILE_SIZE);
+  if (sc != RTEMS_SUCCESSFUL) {
+    printf ("error: untar failed: %s\n", rtems_status_text (sc));
+    exit(1);
+  }
+  printf ("successful\n");
+
+  /******************/
+  printf( "========= /home/test_file =========\n" );
+  test_cat( "/home/test_file", 0, 0 );
+  
+  /******************/
+  printf( "========= /symlink =========\n" );
+  test_cat( "/symlink", 0, 0 );
+
+}
+
+void test_untar_from_file(void)
+{
+  rtems_status_code  sc;
+  int                fd;
+
+  puts( "Copy tar image to test.tar" );
+  /* Copy tar image from object to file in IMFS */
+  fd = open( "/test.tar", O_CREAT|O_TRUNC|O_WRONLY, 0777 );
+  rtems_test_assert( fd != -1 );
+
+  sc = write( fd, TARFILE_START, TARFILE_SIZE );
+  rtems_test_assert( sc == TARFILE_SIZE );
+  close( fd );
+
+  /* make a directory to untar it into */
+  sc = mkdir( "/dest", 0777 );
+  rtems_test_assert( !sc );
+
+  sc = chdir( "/dest" );
+  rtems_test_assert( !sc );
+
+  /* Untar it */
+  sc = Untar_FromFile( "/test.tar" );
+  printf("Untaring from file - ");
+  if (sc != RTEMS_SUCCESSFUL) {
+    printf ("error: untar failed: %s\n", rtems_status_text (sc));
+    exit(1);
+  }
+  printf ("successful\n");
+
+  /******************/
+  printf( "========= /dest/home/test_file =========\n" );
+  test_cat( "/dest/home/test_file", 0, 0 );
+  
+  /******************/
+  printf( "========= /dest/symlink =========\n" );
+  test_cat( "/dest/symlink", 0, 0 );
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  printf( "\n\n*** TAR01 TEST ***\n" );
+
+  test_untar_from_memory();
+  puts( "" );
+  test_untar_from_file();
+
+  printf( "*** END OF TAR01 TEST ***\n" );
+  exit( 0 );
+}
+
+
+/* NOTICE: the clock driver is explicitly disabled */
+#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS            1
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
diff --git a/testsuites/libtests/tar01/tar01.doc b/testsuites/libtests/tar01/tar01.doc
new file mode 100644
index 0000000000..4ae46b4c6d
--- /dev/null
+++ b/testsuites/libtests/tar01/tar01.doc
@@ -0,0 +1,23 @@
+#
+#  $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:  malloc02
+
+directives:
+
+  + Untar_FromMemory
+  + Untar_FromFile
+
+concepts:
+
++ exercise these routines
diff --git a/testsuites/libtests/tar01/tar01.scn b/testsuites/libtests/tar01/tar01.scn
new file mode 100644
index 0000000000..2c4d6b0c08
--- /dev/null
+++ b/testsuites/libtests/tar01/tar01.scn
@@ -0,0 +1,22 @@
+*** TAR01 TEST ***
+Untaring from memory - successful
+========= /home/test_file =========
+(0)This is a test of loading an RTEMS filesystem from an
+initial tar image.
+
+========= /symlink =========
+(0)This is a test of loading an RTEMS filesystem from an
+initial tar image.
+
+
+Copy tar image to test.tar
+Untaring from file - successful
+========= /dest/home/test_file =========
+(0)This is a test of loading an RTEMS filesystem from an
+initial tar image.
+
+========= /dest/symlink =========
+(0)This is a test of loading an RTEMS filesystem from an
+initial tar image.
+
+*** END OF TAR01 TEST ***
diff --git a/testsuites/libtests/tar02/.cvsignore b/testsuites/libtests/tar02/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/libtests/tar02/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/libtests/tar02/Makefile.am b/testsuites/libtests/tar02/Makefile.am
new file mode 100644
index 0000000000..d30910f531
--- /dev/null
+++ b/testsuites/libtests/tar02/Makefile.am
@@ -0,0 +1,52 @@
+##
+## $Id$
+##
+
+rtems_tests_PROGRAMS = tar02
+tar02_SOURCES = init.c ../../psxtests/psxfile01/test_cat.c \
+  initial_filesystem_tar.c
+
+dist_rtems_tests_DATA = tar02.scn
+
+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)/include
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
+
+LINK_OBJS = $(tar02_OBJECTS) $(tar02_LDADD)
+LINK_LIBS = $(tar02_LDLIBS)
+
+tar02$(EXEEXT): stamp-filesystem stamp-initial-fs-source $(tar02_OBJECTS) \
+    $(tar02_DEPENDENCIES)
+	@rm -f tar02$(EXEEXT)
+	$(make-exe)
+
+init.o: init.c stamp-initial-fs-source
+
+initial_filesystem_tar.c: stamp-initial-fs-source
+
+initial_filesystem_tar.h: stamp-initial-fs-source
+
+stamp-initial-fs-source: initial_filesystem.tar
+	$(BIN2C) initial_filesystem.tar initial_filesystem_tar
+	touch stamp-initial-fs-source
+
+stamp-filesystem:
+	rm -rf initial_fs
+	mkdir initial_fs
+	mkdir initial_fs/home
+	(echo "This is a test of loading an RTEMS filesystem from an" ; \
+	echo "initial tar image.") >initial_fs/home/test_file
+	cd initial_fs && ln -s home/test_file symlink
+	touch stamp-filesystem
+
+initial_filesystem.tar: stamp-filesystem
+	cd initial_fs ; pax -w -f ../initial_filesystem.tar home symlink
+
+CLEANFILES = initial_filesystem* stamp-filesystem \
+	    stamp-initial-fs-source
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
new file mode 100644
index 0000000000..040637cb63
--- /dev/null
+++ b/testsuites/libtests/tar02/init.c
@@ -0,0 +1,83 @@
+/*
+ *  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 <bsp.h> /* for device driver prototypes */
+#include "tmacros.h"
+#include <rtems/imfs.h>
+#include <rtems/error.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "initial_filesystem_tar.h"
+
+#define TARFILE_START initial_filesystem_tar
+#define TARFILE_SIZE  initial_filesystem_tar_size
+
+void test_cat(
+  char *file,
+  int   offset_arg,
+  int   length
+);
+
+void test_tarfs_load(void)
+{
+  rtems_status_code sc;
+
+  printf("Loading tarfs image ... ");
+  sc = rtems_tarfs_load("/",(void *)TARFILE_START, TARFILE_SIZE);
+  if (sc != RTEMS_SUCCESSFUL) {
+    printf ("error: untar failed: %s\n", rtems_status_text (sc));
+    exit(1);
+  }
+  printf ("successful\n");
+
+  /******************/
+  printf( "========= /home/test_file =========\n" );
+  test_cat( "/home/test_file", 0, 0 );
+  
+  /******************/
+  puts("*** Skipping symlink -- NOT CURRENTLY SUPPORTED ***" );
+#if 0
+  printf( "========= /symlink =========\n" );
+  test_cat( "/symlink", 0, 0 );
+#endif
+}
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  printf( "\n\n*** TAR02 TEST ***\n" );
+
+  test_tarfs_load();
+
+  printf( "*** END OF TAR02 TEST ***\n" );
+  exit( 0 );
+}
+
+
+/* NOTICE: the clock driver is explicitly disabled */
+#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS            1
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 5
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
diff --git a/testsuites/libtests/tar02/tar02.doc b/testsuites/libtests/tar02/tar02.doc
new file mode 100644
index 0000000000..d225adb107
--- /dev/null
+++ b/testsuites/libtests/tar02/tar02.doc
@@ -0,0 +1,22 @@
+#
+#  $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:  tar02
+
+directives:
+
+  rtems_tarfs_load
+
+concepts:
+
++ exercise methods listed above
diff --git a/testsuites/libtests/tar02/tar02.scn b/testsuites/libtests/tar02/tar02.scn
new file mode 100644
index 0000000000..04f81df228
--- /dev/null
+++ b/testsuites/libtests/tar02/tar02.scn
@@ -0,0 +1,8 @@
+*** TAR02 TEST ***
+Loading tarfs image ... successful
+========= /home/test_file =========
+(0)This is a test of loading an RTEMS filesystem from an
+initial tar image.
+
+*** Skipping symlink -- NOT CURRENTLY SUPPORTED ***
+*** END OF TAR02 TEST ***