Skip to content

Commit d49a9c1

Browse files
authored
Merge pull request ossec#1850 from nurse/travis-with-arm64
Travis with arm64
2 parents 6d7f7e6 + 9dc2a73 commit d49a9c1

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ compiler:
2929
- clang
3030

3131

32+
arch:
33+
- amd64
34+
- arm64
35+
3236
matrix:
3337
fast_finish: true
3438
exclude:
39+
- arch: arm64
40+
env: DB=none OSSEC_TYPE=winagent GEOIP=no PCRE2_SYSTEM=no
3541
- compiler: clang
36-
env: DB=none OSSEC_TYPE=winagent GEOIP=no
42+
env: DB=none OSSEC_TYPE=winagent GEOIP=no PCRE2_SYSTEM=no
3743
- compiler: clang
38-
env: OSSEC_TYPE=server RULES=test
39-
44+
env: OSSEC_TYPE=server RULES=test PCRE2_SYSTEM=no
4045

4146

4247
before_script:
@@ -49,7 +54,7 @@ before_script:
4954
- if [[ "${ZEROMQ}" == "yes" ]]; then ( sudo apt-get install libzmq3-dev libtool autoconf libczmq-dev ); fi
5055
- if [[ "${OSSEC_TYPE}" == "winagent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
5156
- if [[ "${OSSEC_TYPE}" == "server" ]]; then ( sudo apt-get install libsqlite3-dev sqlite3 ); fi
52-
- if [[ "${OSSEC_TYPE}" == "test" ]]; then ( sudo apt-get update && sudo apt-get install check valgrind ); fi
57+
- if [[ "${OSSEC_TYPE}" == "test" ]]; then if [ `uname -m` = "aarch64" ]; then (sudo apt-get install check libc6-dbg && wget -q http://ports.ubuntu.com/pool/main/v/valgrind/valgrind_3.15.0-1ubuntu3.1_arm64.deb && sudo dpkg -i valgrind_3.15.0-1ubuntu3.1_arm64.deb ) ; else ( sudo apt-get install check valgrind ); fi; fi
5358

5459

5560
script:

src/tests/valgrind.supp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
Memcheck:Leak
3131
fun:malloc
3232
fun:strdup
33-
fun:xstrdup
3433
obj:/usr/bin/make
35-
fun:main
3634
}
3735
{
3836
os_net_unit_test_forced_error

0 commit comments

Comments
 (0)