Merge tag '1.4' into since

Version 1.4

1 files changed, 1 insertions, 55 deletions

diff --git a/enwcsndup.c b/enwcsndup.c
index 105542c..f642125 100644
--- a/enwcsndup.c
+++ b/enwcsndup.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -32,16 +32,6 @@ main(void)
 	assert(!wcscmp(s, L"hello"));
 	free(s);
 
-	assert((s = libsimple_ewcsndup(L"test", 10)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5 * sizeof(wchar_t));
-		assert(info->alignment == _Alignof(wchar_t));
-		assert(!info->zeroed);
-	}
-	assert(!wcscmp(s, L"test"));
-	free(s);
-
 	assert((s = libsimple_enwcsndup(1, L"hello", 2)));
 	if (have_custom_malloc()) {
 		assert((info = get_allocinfo(s)));
@@ -52,16 +42,6 @@ main(void)
 	assert(!wcscmp(s, L"he"));
 	free(s);
 
-	assert((s = libsimple_ewcsndup(L"test", 3)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 4 * sizeof(wchar_t));
-		assert(info->alignment == _Alignof(wchar_t));
-		assert(!info->zeroed);
-	}
-	assert(!wcscmp(s, L"tes"));
-	free(s);
-
 	assert((s = libsimple_enwcsndup(1, L"hello", 0)));
 	if (have_custom_malloc()) {
 		assert((info = get_allocinfo(s)));
@@ -72,16 +52,6 @@ main(void)
 	assert(!wcscmp(s, L""));
 	free(s);
 
-	assert((s = libsimple_ewcsndup(L"test", 0)));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 1 * sizeof(wchar_t));
-		assert(info->alignment == _Alignof(wchar_t));
-		assert(!info->zeroed);
-	}
-	assert(!wcscmp(s, L""));
-	free(s);
-
 	if (have_custom_malloc()) {
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enwcsndup(24, L"hello", 10));
@@ -89,41 +59,17 @@ main(void)
 		assert_stderr("%s: wcsndup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
 
-		libsimple_default_failure_exit = 25;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ewcsndup(L"test", 10));
-		assert(exit_status == 25);
-		assert_stderr("%s: wcsndup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
-
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enwcsndup(26, L"hello", 1));
 		assert(exit_status == 26);
 		assert_stderr("%s: wcsndup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
 
-		libsimple_default_failure_exit = 27;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ewcsndup(L"test", 2));
-		assert(exit_status == 27);
-		assert_stderr("%s: wcsndup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
-
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enwcsndup(28, L"hello", 0));
 		assert(exit_status == 28);
 		assert_stderr("%s: wcsndup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
-
-		libsimple_default_failure_exit = 29;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ewcsndup(L"test", 0));
-		assert(exit_status == 29);
-		assert_stderr("%s: wcsndup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
 	}
 
 	return 0;