change log for rtems (2010-06-23)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Jun 23 19:13:24 UTC 2010
*jennifer*:
2010-06-23 Jennifer Averett <Jennifer Averett at OARcorp.com>
* Makefile.am, configure.ac: Added test case for calls that check for
an unopened file descriptor.
* psxfile02/.cvsignore, psxfile02/Makefile.am, psxfile02/init.c,
psxfile02/psxfile02.doc, psxfile02/psxfile02.scn: New files.
M 1.268 testsuites/psxtests/ChangeLog
M 1.59 testsuites/psxtests/Makefile.am
M 1.62 testsuites/psxtests/configure.ac
A 1.1 testsuites/psxtests/psxfile02/.cvsignore
A 1.1 testsuites/psxtests/psxfile02/Makefile.am
A 1.1 testsuites/psxtests/psxfile02/init.c
A 1.1 testsuites/psxtests/psxfile02/psxfile02.doc
A 1.1 testsuites/psxtests/psxfile02/psxfile02.scn
diff -u rtems/testsuites/psxtests/ChangeLog:1.267 rtems/testsuites/psxtests/ChangeLog:1.268
--- rtems/testsuites/psxtests/ChangeLog:1.267 Tue Jun 22 12:44:01 2010
+++ rtems/testsuites/psxtests/ChangeLog Wed Jun 23 13:43:23 2010
@@ -1,3 +1,10 @@
+2010-06-23 Jennifer Averett <Jennifer Averett at OARcorp.com>
+
+ * Makefile.am, configure.ac: Added test case for calls that check for
+ an unopened file descriptor.
+ * psxfile02/.cvsignore, psxfile02/Makefile.am, psxfile02/init.c,
+ psxfile02/psxfile02.doc, psxfile02/psxfile02.scn: New files.
+
2010-06-22 Jennifer Averett <Jennifer.Averett at OARcorp.com>
* psxtime/psxtime.scn, psxtime/test.c: Add a normal case with second
diff -u rtems/testsuites/psxtests/Makefile.am:1.58 rtems/testsuites/psxtests/Makefile.am:1.59
--- rtems/testsuites/psxtests/Makefile.am:1.58 Mon Dec 28 10:43:10 2009
+++ rtems/testsuites/psxtests/Makefile.am Wed Jun 23 13:43:23 2010
@@ -19,8 +19,8 @@
endif
## File IO tests
-SUBDIRS += psxfile01 psxreaddir psxstat psxmount psx13 psxchroot01 \
- psxpasswd01
+SUBDIRS += psxfile01 psxfile02 psxreaddir psxstat psxmount psx13 \
+ psxchroot01 psxpasswd01
## Until sys/uio.h is moved to libcsupport, we have to have networking
## enabled to support readv and writev. Hopefully this is a temporary
diff -u rtems/testsuites/psxtests/configure.ac:1.61 rtems/testsuites/psxtests/configure.ac:1.62
--- rtems/testsuites/psxtests/configure.ac:1.61 Sat May 29 00:31:45 2010
+++ rtems/testsuites/psxtests/configure.ac Wed Jun 23 13:43:23 2010
@@ -87,6 +87,7 @@
psxfatal01/Makefile
psxfatal02/Makefile
psxfile01/Makefile
+psxfile02/Makefile
psxhdrs/Makefile
psxintrcritical01/Makefile
psxitimer/Makefile
diff -u /dev/null rtems/testsuites/psxtests/psxfile02/.cvsignore:1.1
--- /dev/null Wed Jun 23 14:13:23 2010
+++ rtems/testsuites/psxtests/psxfile02/.cvsignore Wed Jun 23 13:43:23 2010
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff -u /dev/null rtems/testsuites/psxtests/psxfile02/Makefile.am:1.1
--- /dev/null Wed Jun 23 14:13:24 2010
+++ rtems/testsuites/psxtests/psxfile02/Makefile.am Wed Jun 23 13:43:23 2010
@@ -0,0 +1,26 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxfile02
+psxfile02_SOURCES = init.c ../../support/src/spin.c
+
+dist_rtems_tests_DATA = psxfile02.scn
+dist_rtems_tests_DATA += psxfile02.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(psxfile02_OBJECTS) $(psxfile02_LDADD)
+LINK_LIBS = $(psxfile02_LDLIBS)
+
+psxfile02$(EXEEXT): $(psxfile02_OBJECTS) $(psxfile02_DEPENDENCIES)
+ @rm -f psxfile02$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff -u /dev/null rtems/testsuites/psxtests/psxfile02/init.c:1.1
--- /dev/null Wed Jun 23 14:13:24 2010
+++ rtems/testsuites/psxtests/psxfile02/init.c Wed Jun 23 13:43:24 2010
@@ -0,0 +1,152 @@
+/*
+ * 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 <stdio.h>
+#include <sys/uio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <rtems/imfs.h>
+
+#include <rtems.h>
+#include <rtems/libio.h>
+
+#include <tmacros.h>
+#include "test_support.h"
+
+int _fcntl_r(
+ struct _reent *ptr __attribute__((unused)),
+ int fd,
+ int cmd,
+ int arg
+);
+
+off_t _lseek_r(
+ struct _reent *ptr __attribute__((unused)),
+ int fd,
+ off_t offset,
+ int whence
+);
+
+
+
+rtems_task Init(
+ rtems_task_argument argument
+)
+{
+ int fd;
+ struct stat stat_buff;
+ struct iovec vec[4];
+ off_t res;
+ int status;
+
+ puts( "\n\n*** PSXFILE02 TEST ***" );
+
+ /*
+ * Simple open case where the file is created.
+ */
+ puts( "mkdir /tmp" );
+ status = mkdir( "/tmp", S_IRWXU );
+ rtems_test_assert( !status );
+
+ puts( "open /tmp/j" );
+ fd = open( "/tmp/j", O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO );
+ rtems_test_assert( fd != -1 );
+ printf( "open returned file descriptor %d\n", fd );
+
+ puts( "close /tmp/j" );
+ status = close( fd );
+ rtems_test_assert( !status );
+
+ puts("ftruncate an unopened file");
+ status = ftruncate(fd, 40);
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("_fcntl_r unopened file");
+ status = _fcntl_r( NULL, fd, F_SETFD, 1 );
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("fdatasync unopened file");
+ status = fdatasync( fd );
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("fstat unopened file");
+ status = fstat( fd, &stat_buff );
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("fsync unopened file");
+ status = fsync( fd );
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("ioctl unopened file");
+ status = ioctl( fd, 0 );
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("_lseek_r unopened file");
+ res = _lseek_r (NULL, fd, 0, SEEK_SET);
+ rtems_test_assert( res == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("readv unopened file");
+ status = readv(fd, vec, 4);
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("writev unopened file");
+ status = writev(fd, vec, 4);
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+ puts("write unopened file");
+ status = write(fd, "1234", 4);
+ rtems_test_assert( status == -1 );
+ printf( "%d: %s\n", errno, strerror( errno ) );
+ rtems_test_assert( errno == EBADF );
+
+
+
+
+ puts( "*** END OF PSXFILE02 TEST ***" );
+
+ rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 6
+#define CONFIGURE_MAXIMUM_TASKS 1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff -u /dev/null rtems/testsuites/psxtests/psxfile02/psxfile02.doc:1.1
--- /dev/null Wed Jun 23 14:13:24 2010
+++ rtems/testsuites/psxtests/psxfile02/psxfile02.doc Wed Jun 23 13:43:24 2010
@@ -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: psxfile02
+
+directives:
+
+ XXX list them
+
+concepts:
+
++ XXX list them
diff -u /dev/null rtems/testsuites/psxtests/psxfile02/psxfile02.scn:1.1
--- /dev/null Wed Jun 23 14:13:24 2010
+++ rtems/testsuites/psxtests/psxfile02/psxfile02.scn Wed Jun 23 13:43:24 2010
@@ -0,0 +1,26 @@
+*** PSXFILE02 TEST ***
+mkdir /tmp
+open /tmp/j
+open returned file descriptor 3
+close /tmp/j
+ftruncate an unopened file
+9: Bad file number
+_fcntl_r unopened file
+9: Bad file number
+fdatasync unopened file
+9: Bad file number
+fstat unopened file
+9: Bad file number
+fsync unopened file
+9: Bad file number
+ioctl unopened file
+9: Bad file number
+_lseek_r unopened file
+9: Bad file number
+readv unopened file
+9: Bad file number
+writev unopened file
+9: Bad file number
+write unopened file
+9: Bad file number
+*** END OF PSXFILE02 TEST ***
*joel*:
2010-06-23 Joel Sherrill <joel.sherrilL at OARcorp.com>
* libmisc/stackchk/check.c: Clean up to improve coverage.
M 1.2454 cpukit/ChangeLog
M 1.67 cpukit/libmisc/stackchk/check.c
diff -u rtems/cpukit/ChangeLog:1.2453 rtems/cpukit/ChangeLog:1.2454
--- rtems/cpukit/ChangeLog:1.2453 Wed Jun 23 00:01:46 2010
+++ rtems/cpukit/ChangeLog Wed Jun 23 13:18:41 2010
@@ -1,3 +1,7 @@
+2010-06-23 Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+ * libmisc/stackchk/check.c: Clean up to improve coverage.
+
2010-06-23 Chris Johns <chrisj at rtems.org>
PR 1577/filesystem
diff -u rtems/cpukit/libmisc/stackchk/check.c:1.66 rtems/cpukit/libmisc/stackchk/check.c:1.67
--- rtems/cpukit/libmisc/stackchk/check.c:1.66 Sat Apr 10 02:32:13 2010
+++ rtems/cpukit/libmisc/stackchk/check.c Wed Jun 23 13:18:42 2010
@@ -116,12 +116,13 @@
#define Stack_check_usable_stack_size(_the_stack) \
((_the_stack)->size - sizeof(Stack_check_Control))
-/*
- * Do we have an interrupt stack?
- * XXX it would sure be nice if the interrupt stack were also
- * stored in a "stack" structure!
- */
-Stack_Control Stack_check_Interrupt_stack;
+#if (CPU_ALLOCATE_INTERRUPT_STACK == TRUE)
+ /*
+ * Did RTEMS allocate the interrupt stack? If so, put it in
+ * Stack_Control format.
+ */
+ Stack_Control Stack_check_Interrupt_stack;
+#endif
/*
* Fill an entire stack area with BYTE_PATTERN. This will be used
@@ -381,28 +382,28 @@
Stack_Control *stack;
char name[5];
- if ( !the_thread )
- return;
-
- if ( !print_handler )
- return;
+ /*
+ * The pointer passed in for the_thread is guaranteed to be non-NULL from
+ * rtems_iterate_over_all_threads() so no need to check it here.
+ */
/*
* Obtain interrupt stack information
*/
-
- if (the_thread == (Thread_Control *) -1) {
- if (Stack_check_Interrupt_stack.area) {
+ #if (CPU_ALLOCATE_INTERRUPT_STACK == TRUE)
+ if (the_thread == (Thread_Control *) -1) {
+ if (!Stack_check_Interrupt_stack.area)
+ return;
stack = &Stack_check_Interrupt_stack;
the_thread = 0;
current = 0;
+ } else
+ #else
+ {
+ stack = &the_thread->Start.Initial_stack;
+ current = (void *)_CPU_Context_Get_SP( &the_thread->Registers );
}
- else
- return;
- } else {
- stack = &the_thread->Start.Initial_stack;
- current = (void *)_CPU_Context_Get_SP( &the_thread->Registers );
- }
+ #endif
low = Stack_check_usable_stack_start(stack);
size = Stack_check_usable_stack_size(stack);
@@ -468,6 +469,9 @@
rtems_printk_plugin_t print
)
{
+ if ( !print )
+ return;
+
print_context = context;
print_handler = print;
@@ -479,8 +483,10 @@
/* iterate over all threads and dump the usage */
rtems_iterate_over_all_threads( Stack_check_Dump_threads_usage );
- /* dump interrupt stack info if any */
- Stack_check_Dump_threads_usage((Thread_Control *) -1);
+ #if (CPU_ALLOCATE_INTERRUPT_STACK == TRUE)
+ /* dump interrupt stack info if any */
+ Stack_check_Dump_threads_usage((Thread_Control *) -1);
+ #endif
print_context = NULL;
print_handler = NULL;
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100623/ffff1cc0/attachment.html>
More information about the vc
mailing list