diff options
| author | Jack Lloyd <[email protected]> | 2019-11-15 10:40:32 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-11-15 12:55:08 -0500 |
| commit | 84e30745803b0054c95155d7c3d31b75f61c0b35 (patch) | |
| tree | a5b2bc1160a9e6f3217e2d0ca6e45da836fbf4bc /src | |
| parent | 865184972cbda7a3b6bd46c2ec0b399cbdde7b6e (diff) | |
Add S390x build
Drop the MIPS build since main purpose of that is to test a big-endian
build with no special support (SIMD, etc), but s390x is better for this,
since it allows running the full test suite.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 2 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 14 | ||||
| -rwxr-xr-x | src/scripts/test_cli.py | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index af0f29c10..fc11067ee 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -11,7 +11,7 @@ set -ev if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$TRAVIS_ARCH" = "aarch64" ] || [ "$TRAVIS_ARCH" = "ppc64le" ]; then + if [ "$TRAVIS_ARCH" = "aarch64" ] || [ "$TRAVIS_ARCH" = "ppc64le" ] || [ "$TRAVIS_ARCH" = "s390x" ]; then sudo apt-get -qq update sudo apt-get install liblzma-dev libbz2-dev ccache diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index 52c64354f..7f7e3bb27 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -61,6 +61,13 @@ jobs: - TARGET="shared" - os: linux + name: Linux s390x + arch: s390x + compiler: gcc + env: + - TARGET="shared" + + - os: linux dist: bionic name: Linux i386 cross compiler: gcc @@ -82,13 +89,6 @@ jobs: - TARGET="cross-arm32" - os: linux - dist: xenial - name: Linux mips64 cross - compiler: gcc - env: - - TARGET="cross-mips64" - - - os: linux dist: bionic name: Android arm32 cross compiler: clang diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py index 993284951..dc1a91fad 100755 --- a/src/scripts/test_cli.py +++ b/src/scripts/test_cli.py @@ -703,14 +703,14 @@ gS3rM6D0oTlF2JjClk/jQuL+Gn+bjufrSnwPnhYrzjNXazFezsu2QGg3v1H1AiEA def cli_cpuid_tests(_tmp_dir): cpuid_output = test_cli("cpuid", []) - if not cpuid_output.startswith('CPUID flags: '): - logging.error('Unexpected cpuid output %s' % (cpuid_output)) + if not cpuid_output.startswith('CPUID flags:'): + logging.error('Unexpected cpuid output "%s"' % (cpuid_output)) flag_re = re.compile('[a-z0-9_]+') flags = cpuid_output[13:].split(' ') for flag in flags: - if flag_re.match(flag) is None: - logging.error('Unexpected CPUID flag name %s' % (flag)) + if flag != '' and flag_re.match(flag) is None: + logging.error('Unexpected CPUID flag name "%s"' % (flag)) def cli_cc_enc_tests(_tmp_dir): test_cli("cc_encrypt", ["8028028028028029", "pass"], "4308989841607208") |