From a62e94cabb349982f3270a2057ab49b975e7cbb7 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Fri, 26 Feb 2016 16:27:52 -0800 Subject: [PATCH] Remove invalid tests. Remove invalid tests that were intended to be tests of (hugemax+1) OOM, for which tests already exist. --- test/integration/mallocx.c | 10 +--------- test/integration/rallocx.c | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/test/integration/mallocx.c b/test/integration/mallocx.c index 6ecd636b..42eee105 100644 --- a/test/integration/mallocx.c +++ b/test/integration/mallocx.c @@ -48,7 +48,7 @@ get_huge_size(size_t ind) TEST_BEGIN(test_overflow) { - size_t hugemax, size; + size_t hugemax; hugemax = get_huge_size(get_nhuge()-1); @@ -61,14 +61,6 @@ TEST_BEGIN(test_overflow) assert_ptr_null(mallocx(SIZE_T_MAX, 0), "Expected OOM for mallocx(size=%#zx, 0)", SIZE_T_MAX); -#if LG_SIZEOF_PTR == 3 - size = ZU(0x600000000000000); -#else - size = ZU(0x6000000); -#endif - assert_ptr_null(mallocx(size, 0), - "Expected OOM for mallocx(size=%#zx, 0", size); - assert_ptr_null(mallocx(1, MALLOCX_ALIGN(ZU(PTRDIFF_MAX)+1)), "Expected OOM for mallocx(size=1, MALLOCX_ALIGN(%#zx))", ZU(PTRDIFF_MAX)+1); diff --git a/test/integration/rallocx.c b/test/integration/rallocx.c index c3c22419..66ad8660 100644 --- a/test/integration/rallocx.c +++ b/test/integration/rallocx.c @@ -221,7 +221,7 @@ TEST_END TEST_BEGIN(test_overflow) { - size_t hugemax, size; + size_t hugemax; void *p; hugemax = get_huge_size(get_nhuge()-1); @@ -238,14 +238,6 @@ TEST_BEGIN(test_overflow) assert_ptr_null(rallocx(p, SIZE_T_MAX, 0), "Expected OOM for rallocx(p, size=%#zx, 0)", SIZE_T_MAX); -#if LG_SIZEOF_PTR == 3 - size = ZU(0x600000000000000); -#else - size = ZU(0x6000000); -#endif - assert_ptr_null(rallocx(p, size, 0), - "Expected OOM for rallocx(p, size=%#zx, 0", size); - assert_ptr_null(rallocx(p, 1, MALLOCX_ALIGN(ZU(PTRDIFF_MAX)+1)), "Expected OOM for rallocx(p, size=1, MALLOCX_ALIGN(%#zx))", ZU(PTRDIFF_MAX)+1);