Merge tag '1.4' into since

Version 1.4

1 files changed, 1 insertions, 19 deletions

diff --git a/enstrdup.c b/enstrdup.c
index f330422..8ccdbb7 100644
--- a/enstrdup.c
+++ b/enstrdup.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -34,30 +34,12 @@ main(void)
 	assert(!strcmp(s, "hello"));
 	free(s);
 
-	assert((s = libsimple_estrdup("test")));
-	if (have_custom_malloc()) {
-		assert((info = get_allocinfo(s)));
-		assert(info->size == 5);
-		assert(info->alignment == 1);
-		assert(!info->zeroed);
-	}
-	assert(!strcmp(s, "test"));
-	free(s);
-
 	if (have_custom_malloc()) {
 		alloc_fail_in = 1;
 		assert_exit_ptr(libsimple_enstrdup(14, "hello"));
 		assert(exit_status == 14);
 		assert_stderr("%s: strdup: %s\n", argv0, strerror(ENOMEM));
 		assert(!alloc_fail_in);
-
-		libsimple_default_failure_exit = 15;
-		alloc_fail_in = 1;
-		assert_exit_ptr(libsimple_estrdup("test"));
-		assert(exit_status == 15);
-		assert_stderr("%s: strdup: %s\n", argv0, strerror(ENOMEM));
-		assert(!alloc_fail_in);
-		libsimple_default_failure_exit = 1;
 	}
 
 	return 0;