From: Martin Matuska <martin@matuska.org>
Date: Sun, 24 Feb 2019 20:21:26 +0000 (+0100)
Subject: Add MS Visual Studio and MinGW tests via Travis CI
X-Git-Tag: v3.4.0~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=353a8f1eeda698abed4e217b6fc4a81f10d440b3;p=thirdparty%2Flibarchive.git

Add MS Visual Studio and MinGW tests via Travis CI
Make MS Visual Studio complain less in test_read_format_rar5.c
---

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..12ed598f6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: C
+matrix:
+  include:
+  - os: windows
+    env: BS=msbuild
+  - os: windows
+    env: BS=mingw
+script:
+  - build/ci/travis_ci.sh
diff --git a/build/ci/travis_ci.sh b/build/ci/travis_ci.sh
new file mode 100755
index 000000000..2373a5e2c
--- /dev/null
+++ b/build/ci/travis_ci.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+UNAME=`uname`
+CURDIR=`pwd`
+SRCDIR="${SRCDIR:-`pwd`}"
+if [ -z "${BUILDDIR}" ]; then
+        BUILDDIR="${CURDIR}/build_ci/${BS}"
+fi
+mkdir -p "${BUILDDIR}"
+cd "${BUILDDIR}"
+case "$UNAME" in
+	MSYS*)
+	if [ "${BS}" = "msbuild" ]; then
+		set -x
+		export PATH=${PATH}:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/15.0/Bin"
+		cmake -G "Visual Studio 15 2017" -D CMAKE_BUILD_TYPE="Release" "${SRCDIR}"
+		MSBuild.exe libarchive.sln //t:ALL_BUILD
+		MSBuild.exe libarchive.sln //t:RUN_ALL_TESTS
+		set +x
+	elif [ "${BS}" = "mingw" ]; then
+		set -x
+		cmake -G "MSYS Makefiles" -D CMAKE_C_COMPILER="${CC}" -D CMAKE_MAKE_PROGRAM="mingw32-make" -D CMAKE_BUILD_TYPE="Release" "${SRCDIR}"
+		mingw32-make
+		mingw32-make test
+		set +x
+	else
+		echo "Unknown or unspecified build type: ${BS}"
+		exit 1
+	fi
+	;;
+esac
diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c
index 7f2f32df4..16198238f 100644
--- a/libarchive/test/test_read_format_rar5.c
+++ b/libarchive/test/test_read_format_rar5.c
@@ -143,7 +143,7 @@ DEFINE_TEST(test_read_format_rar5_stored)
 DEFINE_TEST(test_read_format_rar5_compressed)
 {
     const int DATA_SIZE = 1200;
-    uint8_t buff[DATA_SIZE];
+    uint8_t buff[1200];
 
     PROLOGUE("test_read_format_rar5_compressed.rar");
 
@@ -161,7 +161,7 @@ DEFINE_TEST(test_read_format_rar5_compressed)
 DEFINE_TEST(test_read_format_rar5_multiple_files)
 {
     const int DATA_SIZE = 4096;
-    uint8_t buff[DATA_SIZE];
+    uint8_t buff[4096];
 
     PROLOGUE("test_read_format_rar5_multiple_files.rar");
 
@@ -207,7 +207,7 @@ DEFINE_TEST(test_read_format_rar5_multiple_files)
 DEFINE_TEST(test_read_format_rar5_multiple_files_solid)
 {
     const int DATA_SIZE = 4096;
-    uint8_t buff[DATA_SIZE];
+    uint8_t buff[4096];
 
     PROLOGUE("test_read_format_rar5_multiple_files_solid.rar");
 
@@ -309,7 +309,7 @@ DEFINE_TEST(test_read_format_rar5_multiarchive_skip_all_but_second)
 DEFINE_TEST(test_read_format_rar5_blake2)
 {
     const la_ssize_t proper_size = 814;
-    uint8_t buf[proper_size];
+    uint8_t buf[814];
 
     PROLOGUE("test_read_format_rar5_blake2.rar");
     assertA(0 == archive_read_next_header(a, &ae));
@@ -334,7 +334,7 @@ DEFINE_TEST(test_read_format_rar5_arm_filter)
      * test. */
 
     const la_ssize_t proper_size = 90808;
-    uint8_t buf[proper_size];
+    uint8_t buf[90808];
 
     PROLOGUE("test_read_format_rar5_arm.rar");
     assertA(0 == archive_read_next_header(a, &ae));