From 4b27a5d46454efb003509cc26918ffeff3dfabec Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Fri, 24 Nov 2017 10:58:46 -0800
Subject: [PATCH] Run roundtrip on make check

Adding check-no-roundtrip is done by @masatake.
NOTE: We cannot find the way to ru roundtrip on msys2.
See https://github.com/Alexpux/MSYS2-packages/issues/84 .
---
 makefiles/testing.mak | 9 ++++++++-
 win32/appveyor.bat    | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/makefiles/testing.mak b/makefiles/testing.mak
index 94092630f9..50e10137e5 100644
--- a/makefiles/testing.mak
+++ b/makefiles/testing.mak
@@ -1,7 +1,8 @@
 # -*- makefile -*-
 .PHONY: check units fuzz noise tmain tinst clean-units clean-tmain clean-gcov run-gcov codecheck cppcheck dicts cspell
 
-check: tmain units
+chekc-no-roundtrip: tmain units
+check: tmain units roundtrip
 
 clean-local: clean-units clean-tmain
 
@@ -159,10 +160,16 @@ tinst:
 #
 # Test readtags
 #
+if USE_READCMD
 roundtrip: $(READ_TEST)
 	$(V_RUN) \
 	builddir=$$(pwd); \
 	$(SHELL) $(srcdir)/misc/roundtrip $(READ_TEST) $${builddir}/Units
+else
+# apparently Automake doesn't like adding an extra dependency in a conditional,
+# so add it unconditionally and simply have it not do anything if it's disabled.
+roundtrip:
+endif
 
 #
 # Checking code in ctags own rules
diff --git a/win32/appveyor.bat b/win32/appveyor.bat
index d4f3783de0..35b85f2d24 100755
--- a/win32/appveyor.bat
+++ b/win32/appveyor.bat
@@ -115,7 +115,7 @@ c:\cygwin64\bin\file readtags.exe
 .\ctags --version || exit 1
 
 :: Run tests on msys2
-bash -lc "make check APPVEYOR=1"
+bash -lc "make check-no-roundtrip APPVEYOR=1"
 
 @echo off
 goto :eof
@@ -171,7 +171,7 @@ if "%normalbuild%-%ARCH%"=="yes-x64" (
   @echo Tests for msys2 x64 are skipped.
   exit 0
 )
-bash -lc "make check APPVEYOR=1"
+bash -lc "make check-no-roundtrip APPVEYOR=1"
 
 @echo off
 goto :eof