Testing tweaks:
- split MacOSX build - fix for readdir() failures in check-tcg -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAlvsHkgACgkQ+9DbCVqe KkRgbwf/aR3fPac1aM4wP0feREWvP5uFDkH1lJH4YEOHMip56gRuvyg3caiHmUoz 55+klOYvYFsjk6omCtCneqaPxdHzqdExHlniG7yURWOEnR7RFhjBxNwfBoyfG1Eh ILl3qsquZs5FjoutAEbCekHn8fvokkZDY4f60zrAXdVZmbzt74Qz3YAAXB3Qyuey DNnUbfNwOJlhMiM5VACjetxSWikPcGiWOdNcIDBlT0J3SRpo+BE0Dh7JODpxwLDi Zp9M18fMZnflREoxjOPklp0dSKZqEF+7OywlgpiZ2DIVm8NT84R4q6aYgOFHKCIa 6BmFJ0kqMbn9sYD7vyVFj4S6MpPbQw== =Rczg -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
5eb48906d4
@ -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"
|
||||
|
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user