diff options
| -rw-r--r-- | .travis.yml | 26 | ||||
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 0fc0a66c5c..00fe85fc04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,16 +36,42 @@ matrix: script: - ./scripts/build-otp - ./scripts/run-dialyzer + - env: Linux32 services: - docker script: - ./scripts/build-docker-otp 32 sh -c "scripts/build-otp release && ./otp_build tests && scripts/run-smoke-tests && bin/dialyzer --build_plt --apps erts kernel stdlib" + - env: Linux64SmokeTest script: - ERL_COMPILER_OPTIONS=ssalint ./scripts/build-otp - ERL_COMPILER_OPTIONS=ssalint ./otp_build tests - ./scripts/run-smoke-tests + + - env: Linux-ppc64le-SmokeTest + os: linux-ppc64le + script: + - ./scripts/build-otp + - ./otp_build tests + - ./scripts/run-smoke-tests + addons: + apt: + update: true + packages: + - autoconf + - libncurses-dev + - build-essential + - libssl-dev + - libwxgtk3.0-dev + - libgl1-mesa-dev + - libglu1-mesa-dev + - libpng3 + - default-jdk + - g++ + - xsltproc + - libxml2-utils + - env: Linux64Docbuild script: - ./scripts/build-otp docs diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index 9d6447430d..b69d657aa7 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -701,6 +701,7 @@ get_os_wordsize_with_uname() -> "sparc64" -> 64; "amd64" -> 64; "ppc64" -> 64; + "ppc64le" -> 64; "s390x" -> 64; _ -> 32 end. |