diff options
| author | Peter Maydell | 2018-11-15 12:26:48 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-15 12:26:48 +0100 |
| commit | 5eb48906d49e74061a8f1218330915b80abd7fb7 (patch) | |
| tree | 921d1656d77494c1eb3ae9b35aff768c6a1f6a99 | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181114' into staging (diff) | |
| parent | tests/tcg/multiarch: fix 32bit linux-test on 64bit host (diff) | |
| download | qemu-5eb48906d49e74061a8f1218330915b80abd7fb7.tar.gz qemu-5eb48906d49e74061a8f1218330915b80abd7fb7.tar.xz qemu-5eb48906d49e74061a8f1218330915b80abd7fb7.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-fixes-for-3.1-141118-1' into staging
Testing tweaks:
- split MacOSX build
- fix for readdir() failures in check-tcg
# gpg: Signature made Wed 14 Nov 2018 13:08:24 GMT
# gpg: using RSA key FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-fixes-for-3.1-141118-1:
tests/tcg/multiarch: fix 32bit linux-test on 64bit host
.travis.yml: split MacOSX builds and reduce target list
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | tests/tcg/multiarch/linux-test.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index aa49c7b114..d472fd650b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,8 +107,14 @@ matrix: - env: CONFIG="--disable-tcg" TEST_CMD="" compiler: gcc - - env: CONFIG="" + # MacOSX builds + - env: CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" os: osx + osx_image: xcode9.4 + compiler: clang + - env: CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" + os: osx + osx_image: xcode10 compiler: clang # Python builds - env: CONFIG="--target-list=x86_64-softmmu" diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index e80eccc0ce..fa4243fc04 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -83,7 +83,7 @@ static void test_file(void) struct utimbuf tbuf; struct iovec vecs[2]; DIR *dir; - struct dirent *de; + struct dirent64 *de; /* TODO: make common tempdir creation for tcg tests */ char template[] = "/tmp/linux-test-XXXXXX"; char *tmpdir = mkdtemp(template); @@ -186,7 +186,7 @@ static void test_file(void) error("opendir"); len = 0; for(;;) { - de = readdir(dir); + de = readdir64(dir); if (!de) break; if (strcmp(de->d_name, ".") != 0 && |