David Leverton writes about adventure/crc.c: The 'adventure' game from the games-misc/bsd-games-2.13 package crashes when saving the game on AMD64 (and probably other 64-bit systems, but I haven't checked). Find attached to fix this. http://bugs.gentoo.org/show_bug.cgi?id=77032 About utmpentry.c: the utmpx structure defines the ut_tv member a little differently on 64bit hosts so that a 32bit and 64bit structure can be shared. So the ut_tv is a custom 32bit structure rather than the native 64bit timeval structure. Work around is to assign the submembers instead. http://bugs.gentoo.org/show_bug.cgi?id=102667 --- bsd-games/adventure/crc.c +++ bsd-games/adventure/crc.c @@ -134,7 +134,8 @@ if (step >= sizeof(crctab) / sizeof(crctab[0])) step = 0; } - crcval = (crcval << 8) ^ crctab[i]; + /* Mask to 32 bits. */ + crcval = ((crcval << 8) ^ crctab[i]) & 0xffffffff; } - return crcval & 0xffffffff; /* Mask to 32 bits. */ + return crcval; } --- bsd-games/dm/utmpentry.c +++ bsd-games/dm/utmpentry.c @@ -291,7 +291,8 @@ e->line[sizeof(e->line) - 1] = '\0'; (void)strncpy(e->host, up->ut_host, sizeof(up->ut_host)); e->name[sizeof(e->host) - 1] = '\0'; - e->tv = up->ut_tv; + e->tv.tv_sec = up->ut_tv.tv_sec; + e->tv.tv_usec = up->ut_tv.tv_usec; adjust_size(e); } #endif guix-pack.sh?id=a1ecd7f56c4ffadc49d5501a0df7f4c4556120c2'>treecommitdiff
path: root/tests/guix-pack.sh
AgeCommit message (Collapse)Author
2023-10-28tests: Adjust to cope with glibc graft.Ludovic Courtès
This is a followup to 1328c4cca531318e3ed90c6aecb522a5b22a4bcc, which led to failures for tests that were not prepared to cope with that. * tests/guix-environment-container.sh (hello_drv_nested): Pass “-E GUIX_BUILD_OPTIONS” so ‘--no-grafts’ is passed. * tests/guix-pack.sh (GUIX_BUILD_OPTIONS): Add ‘--no-grafts’. * tests/transformations.scm ("options->transformation, with-graft"): Skip when ‘glibc-final’ has a replacement. Change-Id: Ia65c9aeb06f524252815b8290a5ca7bf97ee8136
2023-04-21tests: Fix checks for expected failures.Eric Bavier
Addresses <https://issues.guix.gnu.org/62406>. With 'set -e', a return status inverted with '!' does not cause the shell to exit immediately. Instead use '&& false' to indicate an expected failure. * tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment-container.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh, tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with '... && false' or `test ! ...` as appropriate. Signed-off-by: Ludovic Courtès <ludo@gnu.org>