Ticket #1532: psxload01-try2.diff

testsuites/aclocal/canonicalize-tools.m4

@@ -18 +18 @@
 
 dnl NOTE: These may not be available if not using gnutools
   RTEMS_CHECK_TOOL(OBJCOPY,objcopy,no)
+  RTEMS_CHECK_TOOL(OBJDUMP,objdump,no)
   RTEMS_CHECK_TOOL(SIZE,size,no)
   RTEMS_CHECK_TOOL(STRIP,strip,:)
 ])

new file testsuites/aclocal/obj-format.m4

@@ +1 @@
+#
+# $Id$
+#
+
+AC_DEFUN([RTEMS_OBJECT_FORMAT], 
+[
+  AC_MSG_CHECKING([for object file format])
+
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -c -o conftest.o"
+  AC_TRY_COMPILE([],[],
+    [RTEMS_OBJ_FORMAT=`${OBJDUMP} -f conftest.o | grep .o: | sed -e "s/^.*format //"`],
+    [RTEMS_OBJ_FORMAT=none])
+
+  CFLAGS="$save_CFLAGS"
+
+  AC_MSG_RESULT([$RTEMS_OBJ_FORMAT])
+
+  AC_SUBST(RTEMS_OBJ_FORMAT)
+])

testsuites/psxtests/Makefile.am

@@ -10 +10 @@
     psx10 psx11 psx12 psx13 psx14 psxalarm01 \
     psxautoinit01 psxautoinit02 psxbarrier01 \
     psxcancel psxcancel01 psxcleanup psxcleanup01 \
-    psxcond01 psxenosys psxkey01 psxkey02 \
-    psxkey03 psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 \
+    psxcond01 psxenosys psxkey01 psxkey02 psxkey03 psxload01 \
+    psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmsgq04 \
     psxmutexattr01 psxobj01 psxrwlock01 psxsem01 psxsignal01 psxsignal02 \
     psxsignal03 psxsignal04 psxsignal05 psxspin01 psxspin02 psxsysconf \
     psxtime psxtimer01 psxtimer02 psxualarm psxusleep psxfatal01 psxfatal02 \

testsuites/psxtests/configure.ac

@@ -22 +22 @@
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
+RTEMS_OBJECT_FORMAT
+
 AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
 
 RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
@@ -90 +92 @@
 psxkey01/Makefile
 psxkey02/Makefile
 psxkey03/Makefile
+psxload01/Makefile
 psxmount/Makefile
 psxmsgq01/Makefile
 psxmsgq02/Makefile

new file testsuites/psxtests/psxload01/.cvsignore

@@ +1 @@
+Makefile
+Makefile.in

new file testsuites/psxtests/psxload01/Makefile.am

@@ +1 @@
+##
+## $Id: Makefile.am,v 1.25 2009/04/03 12:44:41 ralf Exp $
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxload01
+psxload01_SOURCES = init.c ../include/pmacros.h ../psxfile01/test_cat.c
+
+dist_rtems_tests_DATA = psxload01.scn
+
+psxload01_LDADD = initial_filesystem_tar.o
+
+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
+
+LINK_OBJS = $(psxload01_OBJECTS) $(psxload01_LDADD)
+LINK_LIBS = $(psxload01_LDLIBS)
+
+psxload01$(EXEEXT): $(psxload01_OBJECTS) $(psxload01_DEPENDENCIES)
+        @rm -f psxload01$(EXEEXT)
+        $(make-exe)
+
+initial_filesystem_tar.o: initial_fs/home/test_file
+        (cd $(srcdir)/initial_fs && \
+         rm -f symlink && ln -s home/test_file symlink && \
+         tar cf - home symlink && rm -f symlink ) > initial_filesystem.tar
+        $(OBJCOPY) -I binary -B $(RTEMS_CPU) -O $(RTEMS_OBJ_FORMAT) \
+        initial_filesystem.tar $@
+
+include $(top_srcdir)/../automake/local.am

new file testsuites/psxtests/psxload01/init.c

@@ +1 @@
+/*
+ *  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: init.c,v 1.17 2009/10/02 11:50:39 joel Exp $
+ */
+
+#include <bsp.h> /* for device driver prototypes */
+#include <rtems/untar.h>
+#include <rtems/error.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/*
+ *  The tarfile is built automatically externally so we need to account
+ *  for the leading symbol on the names.
+ */
+#if defined(__sh__)
+  #define SYM(_x) _x
+#else
+  #define SYM(_x) _ ## _x
+#endif
+
+/**
+ * The initial tarfile parameters.
+ */
+extern int SYM(binary_initial_filesystem_tar_start);
+extern int SYM(binary_initial_filesystem_tar_size);
+
+#define TARFILE_START SYM(binary_initial_filesystem_tar_start)
+#define TARFILE_SIZE  SYM(binary_initial_filesystem_tar_size)
+
+void test_cat(
+  char *file,
+  int   offset_arg,
+  int   length
+);
+
+
+rtems_task Init(
+  rtems_task_argument ignored
+)
+{
+  printf( "\n\n*** PSXLOAD01 TEST ***\n" );
+ rtems_status_code sc;
+
+  printf("Loading filesystem: ");
+
+  sc = Untar_FromMemory((void *)(&TARFILE_START), (size_t)&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 );
+  printf( "*** END OF PSXLOAD01 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 4
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>

new file testsuites/psxtests/psxload01/initial_fs/home/test_file

@@ +1 @@
+This is a test of loading an RTEMS filesystem from an
+initial tar image.