From: Garrett C. <ris...@li...> - 2010-07-11 04:22:54
|
The branch, master, has been updated via f8d3588cca35972c6ef96769468af6e5e615950c (commit) via 2ba63f24f2f3fcc65191ab0de172907c96712b0c (commit) from ec5557833ef9b56de0a174b976d06dce396b4112 (commit) - Log ----------------------------------------------------------------- commit f8d3588cca35972c6ef96769468af6e5e615950c Author: Garrett Cooper <yan...@gm...> Date: Sat Jul 10 21:19:59 2010 -0700 If t0 isn't present or exec'able - game over. This avoids non-intuitive HUNG errors in run-test.sh. Signed-off-by: Garrett Cooper <yan...@gm...> commit 2ba63f24f2f3fcc65191ab0de172907c96712b0c Author: Garrett Cooper <yan...@gm...> Date: Sat Jul 10 21:18:48 2010 -0700 Sync checks for sys/mman.h w/ posixtest HEAD. Signed-off-by: Garrett Cooper <yan...@gm...> ----------------------------------------------------------------------- Summary of changes: testcases/open_posix_testsuite/bin/run-tests.sh | 6 ++++++ .../definitions/sys/mman_h/10-1-buildonly.c | 5 +++++ .../definitions/sys/mman_h/20-1-buildonly.c | 5 +++++ .../definitions/sys/mman_h/21-1-buildonly.c | 5 +++++ .../definitions/sys/mman_h/22-1-buildonly.c | 5 +++++ .../definitions/sys/mman_h/8-1-buildonly.c | 5 +++++ .../definitions/sys/mman_h/8-2-buildonly.c | 5 +++++ .../definitions/sys/mman_h/8-3-buildonly.c | 5 +++++ 8 files changed, 41 insertions(+), 0 deletions(-) diff --git a/testcases/open_posix_testsuite/bin/run-tests.sh b/testcases/open_posix_testsuite/bin/run-tests.sh index 6d98b08..b2ab6b5 100755 --- a/testcases/open_posix_testsuite/bin/run-tests.sh +++ b/testcases/open_posix_testsuite/bin/run-tests.sh @@ -93,8 +93,14 @@ fi SCRIPT_DIR=`dirname "$0"` TEST_PATH=$1; shift +T0=$SCRIPT_DIR/t0 T0_VAL=$SCRIPT_DIR/t0.val +if [ ! -x $T0 ]; then + echo >&2 "ERROR: $T0 doesn't exist / isn't executable" + exit 1 +fi + if [ ! -f "$T0_VAL" ]; then $SCRIPT_DIR/t0 0 echo $? > "$T0_VAL" diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/10-1-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/10-1-buildonly.c index fd3a3ee..a30c7e6 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/10-1-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/10-1-buildonly.c @@ -15,6 +15,9 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 struct posix_typed_mem_info this_type_should_exist, t; @@ -26,3 +29,5 @@ int dummyfcn(void) return 0; } + +#endif diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/20-1-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/20-1-buildonly.c index 546ae8c..05160a1 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/20-1-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/20-1-buildonly.c @@ -16,6 +16,9 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 typedef int (*posix_mem_offset_test)(const void *restrict, size_t, off_t *restrict, size_t *restrict, @@ -27,3 +30,5 @@ int dummyfcn (void) dummyvar = posix_mem_offset; return 0; } + +#endif diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/21-1-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/21-1-buildonly.c index 9900ef9..45d6b31 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/21-1-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/21-1-buildonly.c @@ -15,6 +15,9 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 typedef int (*posix_typed_mem_get_info_test)(int, struct posix_typed_mem_info *); @@ -24,3 +27,5 @@ int dummyfcn (void) dummyvar = posix_typed_mem_get_info; return 0; } + +#endif diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/22-1-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/22-1-buildonly.c index eaae4d7..ed30fa8 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/22-1-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/22-1-buildonly.c @@ -15,6 +15,9 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 typedef int (*posix_typed_mem_open_test)(const char *, int, int); @@ -24,3 +27,5 @@ int dummyfcn (void) dummyvar = posix_typed_mem_open; return 0; } + +#endif diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-1-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-1-buildonly.c index 1b80031..bae76ca 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-1-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-1-buildonly.c @@ -14,7 +14,12 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 #ifndef POSIX_TYPED_MEM_ALLOCATE #error POSIX_TYPED_MEM_ALLOCATE not defined #endif + +#endif diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-2-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-2-buildonly.c index 887fc7a..22738f2 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-2-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-2-buildonly.c @@ -14,7 +14,12 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 #ifndef POSIX_TYPED_MEM_ALLOCATE_CONTIG #error POSIX_TYPED_MEM_ALLOCATE_CONTIG not defined #endif + +#endif diff --git a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-3-buildonly.c b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-3-buildonly.c index e3f5e8c..76eea4c 100644 --- a/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-3-buildonly.c +++ b/testcases/open_posix_testsuite/conformance/definitions/sys/mman_h/8-3-buildonly.c @@ -14,7 +14,12 @@ */ #include <sys/mman.h> +#include <unistd.h> + +#if defined(_POSIX_TYPED_MEMORY_OBJECTS) && _POSIX_TYPED_MEMORY_OBJECTS != -1 #ifndef POSIX_TYPED_MEM_MAP_ALLOCATABLE #error POSIX_TYPED_MEM_MAP_ALLOCATABLE not defined #endif + +#endif hooks/post-receive -- ltp |