From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Tue, 4 Jun 2019 16:34:20 +0000 (-0700)
Subject: Added linux arm for cmake to travis matrix.
X-Git-Tag: 1.9.9-b1~474
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c35e4f992aea67e92f36dc5a7b8c0bdf5f46f2;p=thirdparty%2Fzlib-ng.git

Added linux arm for cmake to travis matrix.
---

diff --git a/.travis.yml b/.travis.yml
index 1c0b0f0f..a27e4147 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,6 +121,19 @@ matrix:
       env:
         - GENERATOR="./configure --warn --zlib-compat"
         - CHOST=aarch64-linux-gnu
+    - os: linux
+      compiler: aarch64-linux-gnu-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-aarch64-linux-gnu
+            - libc-dev-arm64-cross
+      # For all aarch64 implementations NEON is mandatory, while crypto/crc are not.
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake . -DZLIB_COMPAT=ON"
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
     - os: linux
       compiler: aarch64-linux-gnu-gcc
       addons:
@@ -132,6 +145,18 @@ matrix:
       env:
         - GENERATOR="./configure --warn --zlib-compat"
         - CHOST=aarch64-linux-gnu
+    - os: linux
+      compiler: aarch64-linux-gnu-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-aarch64-linux-gnu
+            - libc-dev-arm64-cross
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake ."
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
     # Hard-float subsets
     - os: linux
       compiler: arm-linux-gnueabihf-gcc
@@ -144,6 +169,18 @@ matrix:
       env:
         - GENERATOR="./configure --warn"
         - CHOST=arm-linux-gnueabihf
+    - os: linux
+      compiler: arm-linux-gnueabihf-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-arm-linux-gnueabihf
+            - libc-dev-armhf-cross
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake . -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf"
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
     - os: linux
       compiler: arm-linux-gnueabihf-gcc
       addons:
@@ -155,6 +192,18 @@ matrix:
       env:
         - GENERATOR="./configure --warn --zlib-compat --without-neon"
         - CHOST=arm-linux-gnueabihf
+    - os: linux
+      compiler: arm-linux-gnueabihf-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-arm-linux-gnueabihf
+            - libc-dev-armhf-cross
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake . -DZLIB_COMPAT=ON -DWITH_NEON=OFF -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf"
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
     - os: linux
       compiler: arm-linux-gnueabihf-gcc
       addons:
@@ -166,6 +215,18 @@ matrix:
       env:
         - GENERATOR="./configure --warn --zlib-compat"
         - CHOST=arm-linux-gnueabihf
+    - os: linux
+      compiler: arm-linux-gnueabihf-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-arm-linux-gnueabihf
+            - libc-dev-armhf-cross
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake . -DZLIB_COMPAT=ON -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf"
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
     # Soft-float subset
     - os: linux
       compiler: arm-linux-gnueabi-gcc
@@ -178,6 +239,18 @@ matrix:
       env:
         - GENERATOR="./configure"
         - CHOST=arm-linux-gnueabi
+    - os: linux
+      compiler: arm-linux-gnueabi-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-arm-linux-gnueabi
+            - libc-dev-armel-cross
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake . -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabi"
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
     - os: linux
       compiler: arm-linux-gnueabi-gcc
       addons:
@@ -189,6 +262,18 @@ matrix:
       env:
         - GENERATOR="./configure --zlib-compat"
         - CHOST=arm-linux-gnueabi
+    - os: linux
+      compiler: arm-linux-gnueabi-gcc
+      addons:
+        apt:
+          packages:
+            - qemu
+            - gcc-arm-linux-gnueabi
+            - libc-dev-armel-cross
+      env:
+        - GENERATOR="cmake -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake . -DZLIB_COMPAT=ON -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabi"
+        - MAKER="cmake --build . --config Release"
+        - TESTER="ctest --verbose -C Release"
 
 script:
   - mkdir -p $BUILDDIR