From cb44d961212991f32c90c3cb79ace569de34b1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 20 Jun 2019 17:44:23 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"MATLAB=20testsuite:=20don=E2=80=99t?=
 =?UTF-8?q?=20use=20-batch=20for=20the=20time=20being=20on=20Linux=20and?=
 =?UTF-8?q?=20macOS"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It actually does not prevent crashes, see for example:
https://git.dynare.org/Dynare/dynare/-/jobs/4314

This reverts commit 3cf650a2dd709274f3b821dbec6a777ed3ef795b.
---
 m4/ax_matlab_batch_options.m4 | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/m4/ax_matlab_batch_options.m4 b/m4/ax_matlab_batch_options.m4
index ec68f3936..a18b87163 100644
--- a/m4/ax_matlab_batch_options.m4
+++ b/m4/ax_matlab_batch_options.m4
@@ -22,16 +22,7 @@ AC_REQUIRE([AX_MATLAB_ARCH])
 AC_REQUIRE([AX_MATLAB_VERSION])
 
 AX_COMPARE_VERSION([$MATLAB_VERSION], [ge], [9.6],
-  [
-    if test "${MATLAB_ARCH}" = win32 -o "${MATLAB_ARCH}" = win64; then
-      MATLAB_BATCH_OPTIONS='-noFigureWindows -batch'
-    else
-      dnl The new -batch option leads to random crashes in Gitlab CI (as of
-      dnl MATLAB R2019a Update 1), so avoid it for the time being (except under
-      dnl Windows where it is quite useful)
-      MATLAB_BATCH_OPTIONS='-nosplash -nodisplay -r'
-    fi
-  ],
+  [MATLAB_BATCH_OPTIONS='-noFigureWindows -batch'],
   [
     if test "${MATLAB_ARCH}" = win32 -o "${MATLAB_ARCH}" = win64; then
       MATLAB_BATCH_OPTIONS='-nosplash -automation -wait -sd "$(CURDIR)" -r'