Merge tag '1.4' into since

Version 1.4

1 files changed, 1 insertions, 19 deletions

diff --git a/enwcsdup.c b/enwcsdup.c
index 1fa27c0..b293f2f 100644
--- a/enwcsdup.c
+++ b/enwcsdup.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -39,30 +39,12 @@ main(void)
 	assert(!wcscmp(s, L"hello"));
 	free(s);
 
-	assert((s = libsimple_ewcsdup(L"test")));
-	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);
-
 	if (have_custom_malloc()) {
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enwcsdup(18, L"hello"));
 		assert(exit_status == 18);
 		assert_stderr("%s: wcsdup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
-
-		libsimple_default_failure_exit = 5;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_ewcsdup(L"test"));
-		assert(exit_status == 5);
-		assert_stderr("%s: wcsdup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
 	}
 
 	return 0;