From 50466f62848093614e58cd8b84e1d2bdcc2cfaa1 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 28 Jan 2024 07:45:25 -0800
Subject: [PATCH] test: more rerunning autotools, C++ std:: portability.

Trying to fix more of https://bugs.gnu.org/68119.

* t/aclocal-deleted-header-aclocal-amflags.sh: $sleep
before file modifications.
* t/aclocal-deleted-header.sh: likewise.
* t/aclocal-deps.sh: likewise.
* t/subdir-add2-pr46.sh: likewise.
* t/yacc-mix-c-cxx.sh: #include <cstdlib> before using std::...,
following yacc-cxx and yacc-d-cxx tests.
---
 t/aclocal-deleted-header-aclocal-amflags.sh | 3 +--
 t/aclocal-deleted-header.sh                 | 3 +--
 t/aclocal-deps.sh                           | 2 +-
 t/subdir-add2-pr46.sh                       | 4 +++-
 t/yacc-mix-c-cxx.sh                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/aclocal-deleted-header-aclocal-amflags.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index b24bd0816..13807799b 100644
--- a/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -42,13 +42,12 @@ EOF
 $ACLOCAL -I .
 $AUTOMAKE
 $AUTOCONF
-
 ./configure
-
 $MAKE
 grep GREPFOO Makefile
 grep GREPBAR Makefile && exit 1
 
+$sleep
 sed 's/FOO/BAR/' < configure.ac > t
 mv -f t configure.ac
 rm -f foo.m4
diff --git a/t/aclocal-deleted-header.sh b/t/aclocal-deleted-header.sh
index 8c277cb96..b043a388f 100644
--- a/t/aclocal-deleted-header.sh
+++ b/t/aclocal-deleted-header.sh
@@ -39,13 +39,12 @@ EOF
 $ACLOCAL
 $AUTOMAKE
 $AUTOCONF
-
 ./configure
-
 $MAKE
 grep GREPFOO Makefile
 grep GREPBAR Makefile && exit 1
 
+$sleep
 sed 's/FOO/BAR/' < configure.ac > t
 mv -f t configure.ac
 rm -f foo.m4
diff --git a/t/aclocal-deps.sh b/t/aclocal-deps.sh
index 7b2fdc0a6..02b06438a 100644
--- a/t/aclocal-deps.sh
+++ b/t/aclocal-deps.sh
@@ -64,7 +64,7 @@ $MAKE check-not-foo
 
 # Update one of the macros.  This should cause ./configure, Makefile.in,
 # Makefile, lib/Makefile.in, and lib/Makefile to be updated.
-
+$sleep
 cat >m4/mymacro.m4 <<'EOF'
 AC_DEFUN([MY_MACRO], [AC_LIBOBJ([foo])])
 EOF
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
index 6661581c2..1d65d92bb 100644
--- a/t/subdir-add2-pr46.sh
+++ b/t/subdir-add2-pr46.sh
@@ -57,7 +57,7 @@ $MAKE
 # configure.ac.  That is already tested by 'subdir-add-pr46.sh' though,
 # so here we try to just edit a file that is included by configure.ac,
 # without touching configure.ac itself.
-
+$sleep
 mkdir sub/maude
 cat > sub/maude/Makefile.am << 'END'
 include_HEADERS = foo.h
@@ -80,6 +80,7 @@ echo 'AC_CONFIG_FILES([maude/Makefile sub/maude/Makefile])' >> confiles.m4
 # We want a simple rebuild from sub/ to create sub/maude/Makefile
 # and maude/Makefile automatically.
 cd sub
+$sleep
 $MAKE
 cd ..
 grep '^SUBDIRS = *maude *$' sub/Makefile.in
@@ -89,6 +90,7 @@ test -f sub/maude/Makefile
 
 # Make sure the dependencies of aclocal.m4 or honored at least from
 # the top-level directory.
+$sleep
 echo 'AC_DEFUN([MORE_DEFS], [AC_SUBST([GREPME])])' > m4/moredefs.m4
 $MAKE
 
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index 6138ead1f..0e7e2e104 100644
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -88,10 +88,10 @@ cat > parse.yy <<'END'
 // https://bugs.gnu.org/20031
 #include <stdlib.h>
 // Valid C++, but deliberately invalid C.
+#include <cstdlib>
 using std::exit;
 using std::free;
 using std::malloc;
-#include <cstdlib>
 #include "parse.hh"
 int yylex (void) { return 0; }
 void yyerror (const char *s) {}
-- 
2.47.2