Skip to content

Commit

Permalink
Ignore EOL style for tests on Win
Browse files Browse the repository at this point in the history
* Fix c7805c9
* As reported by #84
  • Loading branch information
tbeu committed Mar 25, 2018
1 parent 46fdb74 commit 36f48ce
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
18 changes: 13 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ else
AC_DEFINE_UNQUOTED([MAT73],[1],[MAT v7.3 file support])
mat73=yes
fi
AM_CONDITIONAL(MAT73, test "x$mat73" = "xyes")
AM_CONDITIONAL([MAT73], [test "x$mat73" = "xyes"])

MATIO_CHECK_DEFAULT_FILE_VERSION

Expand All @@ -319,7 +319,7 @@ else
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED([EXTENDED_SPARSE],[],[Extended sparse matrix data types])
fi
AM_CONDITIONAL(EXTENDED_SPARSE, test "x$extended_sparse" = "xyes")
AM_CONDITIONAL([EXTENDED_SPARSE], [test "x$extended_sparse" = "xyes"])

linux="no"
winnt="no"
Expand All @@ -342,9 +342,17 @@ case $build_os in
AC_DEFINE_UNQUOTED([SUN],[],[OS is Solaris]);;
esac

AM_CONDITIONAL(LINUX, test "x$linux" = "xyes")
AM_CONDITIONAL(WINNT, test "x$winnt" = "xyes")
AM_CONDITIONAL(SUN, test "x$sun" = "xyes")
AM_CONDITIONAL([LINUX], [test "x$linux" = "xyes"])
AM_CONDITIONAL([WINNT], [test "x$winnt" = "xyes"])
AM_CONDITIONAL([SUN], [test "x$sun" = "xyes"])

winnt="no"
case "${host_os}" in
cygwin*|mingw*)
winnt=yes;;
esac

AM_CONDITIONAL([IS_WIN32], [test "x$winnt" = "xyes"])

# Initialize the test suite.
AC_CONFIG_TESTDIR([test])
Expand Down
7 changes: 7 additions & 0 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,17 @@ else
EXTENDED_SPARSE = 0
endif

if IS_WIN32
IS_WIN32 = 1
else
IS_WIN32 = 0
endif

CHECK_ENVIRONMENT = GREP=$(GREP) MAT73=$(MAT73) MATLABEXE=$(MATLABEXE) \
HAVE_UINT64=$(HAVE_UINT64) HAVE_INT64=$(HAVE_INT64) \
EXTENDED_SPARSE=$(EXTENDED_SPARSE) \
COMPRESSION_ZLIB=$(COMPRESSION_ZLIB) \
IS_WIN32=$(IS_WIN32) \
LIBTOOL="$(top_builddir)/libtool"

EXTRA_DIST = $(TESTSUITE_AT) $(TESTSUITE) $(srcdir)/package.m4 \
Expand Down
2 changes: 1 addition & 1 deletion test/testsuite.at
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ seq () {
done
}

if test "$IS_WIN32" = "yes"; then
if test $IS_WIN32 -eq 1; then
pwd () {
command pwd -W "$@"
}
Expand Down

0 comments on commit 36f48ce

Please sign in to comment.