The following changes since commit 186ac05f749c69e98030f037aa930ff2bc4ad7fb:

  Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.1-pull-request' into staging (2018-11-13 11:45:16 +0000)

are available in the Git repository at:

  https://github.com/stsquad/qemu.git tags/pull-testing-fixes-for-3.1-141118-1

for you to fetch changes up to 1f442da51e088160e892c4e059c154eec3f058c5:

  tests/tcg/multiarch: fix 32bit linux-test on 64bit host (2018-11-14 11:07:06 +0000)

----------------------------------------------------------------
Testing tweaks:

  - split MacOSX build
  - fix for readdir() failures in check-tcg

----------------------------------------------------------------
Alex Bennée (1):
      .travis.yml: split MacOSX builds and reduce target list

Laurent Vivier (1):
      tests/tcg/multiarch: fix 32bit linux-test on 64bit host

 .travis.yml                      | 8 +++++++-
 tests/tcg/multiarch/linux-test.c | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.17.1

On 14 November 2018 at 13:10, Alex Bennée <alex.bennee@linaro.org> wrote:
> The following changes since commit 186ac05f749c69e98030f037aa930ff2bc4ad7fb:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.1-pull-request' into staging (2018-11-13 11:45:16 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-testing-fixes-for-3.1-141118-1
>
> for you to fetch changes up to 1f442da51e088160e892c4e059c154eec3f058c5:
>
>   tests/tcg/multiarch: fix 32bit linux-test on 64bit host (2018-11-14 11:07:06 +0000)
>
> ----------------------------------------------------------------
> Testing tweaks:
>
>   - split MacOSX build
>   - fix for readdir() failures in check-tcg
>
Applied, thanks.

-- PMM

We have reached the point where the MacOSX build was regularly timing
out. So as before I've reduced the target list to "major"
architectures to try and bring the build time down. I've added an
additional MacOSX build with the latest XCode with a minimal list of
"most likely" targets on MacOS.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

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"
-- 
2.17.1

From: Laurent Vivier <laurent@vivier.eu>

Fix:

  TEST    linux-test on i386
  .../tests/tcg/multiarch/linux-test.c:201: readdir

readdir() calls getdents64() to have the list of the entries in a
directory, and getdents64() can return 64bit d_off values (with ext4,
for instance) that will not fit in the 32bit d_off field of the
readdir() dirent structure.

To avoid that, use readdir64() to use a 64bit d_off field too.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

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 &&
-- 
2.17.1