* PKGBUILD:
- add (make)dependency to libiconv (apparently new with m4 1.4.19)
- remove INSTALL directive, since routines in m4.install are
automatically covered by makepkg
** prepare:
- remove any M4 macro patches to make running 'autoreconf' obsolete
- add patches for test suite
** build:
- apply VPATH build
- fool configure that gcc is CYGWIN to be able to use CONFIGURE straight
out of the box (without patching code bits missing MSYS as system).
For GNULIB this is a nightmare.
- enable multi-threading
**check:
- pass list of tests still failing after applying patch skipping tests
due to permission access issues
(see 0003-m4-1.1.19-skip-tests-when-temp-directories-cannot-be-generated.patch)
on to 'make check' via variable XFAIL_TESTS. This applies to GNULIB
tests checking the environment only, but not M4 features, though.
- NB: All tests except those in variable XFAIL_TESTS succeed.
* 0001-m4-1.4.19-tests-refine-error-messages.patch:
- added, no functional change
* 0002-m4-1.1.19-skip-tests-when-temp-directories-cannot-be-generated.patch:
- added, skip test failing in the prep phase when generating directories
with particular access rights
* m4.install:
- removed (since obsolete as functionality covered by pacman/makepkg)
* m4-1.4.18-msys2.patch:
- removed, since configure is used straight out of the box being fooled
that a CYGWIN compiler is used
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From d05afacedffd5cb39194a4f2a4dba41cc30c299a Mon Sep 17 00:00:00 2001
|
|
From: Jannick <thirdedition@gmx.net>
|
|
Date: Sat, 5 Jun 2021 19:22:26 +0200
|
|
Subject: [PATCH] m4 1.4.19: tests - refine error messages
|
|
|
|
* tests/macros.h:
|
|
- append to failed assert error message the system error message if
|
|
available, "No error message" otherwise.
|
|
---
|
|
tests/macros.h | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/macros.h b/tests/macros.h
|
|
index fccfc50..81d0b0d 100644
|
|
--- a/tests/macros.h
|
|
+++ b/tests/macros.h
|
|
@@ -20,6 +20,8 @@
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#include <string.h>
|
|
+#include <errno.h>
|
|
|
|
#ifndef FALLTHROUGH
|
|
# if (__GNUC__ >= 7) || (__clang_major__ >= 10)
|
|
@@ -56,8 +58,9 @@
|
|
{ \
|
|
if (!(expr)) \
|
|
{ \
|
|
- fprintf (ASSERT_STREAM, "%s:%d: assertion '%s' failed\n", \
|
|
- __FILE__, __LINE__, #expr); \
|
|
+ fprintf (ASSERT_STREAM, "%s:%d: assertion '%s' failed: %s\n", \
|
|
+ __FILE__, __LINE__, #expr, \
|
|
+ errno ? strerror(errno) : "No error message"); \
|
|
fflush (ASSERT_STREAM); \
|
|
abort (); \
|
|
} \
|
|
--
|
|
2.31.1.windows.1
|
|
|