This patch fixes a failing unit test by feeding buildNormalizedPath to the tzdata properly. Three other tests are disabled, one assumes /root and the two others use networking. Not bad out of almost 700 tests! by Pjotr Prins --- a/std/datetime.d.orig 2016-11-24 01:13:52.584495545 +0100 +++ b/std/datetime.d 2016-11-24 01:17:09.655306728 +0100 @@ -28081,22 +28081,24 @@ import std.range : retro; import std.format : format; - name = strip(name); - enforce(tzDatabaseDir.exists(), new DateTimeException(format("Directory %s does not exist.", tzDatabaseDir))); enforce(tzDatabaseDir.isDir, new DateTimeException(format("%s is not a directory.", tzDatabaseDir))); version(Android) { + name = strip(name); auto tzfileOffset = name in tzdataIndex(tzDatabaseDir); enforce(tzfileOffset, new DateTimeException(format("The time zone %s is not listed.", name))); string tzFilename = separate_index ? "zoneinfo.dat" : "tzdata"; immutable file = buildNormalizedPath(tzDatabaseDir, tzFilename); } else - immutable file = buildNormalizedPath(tzDatabaseDir, name); + { + auto filename = "./" ~ strip(name); // make sure the prefix is not stripped + immutable file = buildNormalizedPath(tzDatabaseDir, filename); + } - enforce(file.exists(), new DateTimeException(format("File %s does not exist.", file))); + enforce(file.exists(), new DateTimeException(format("File %s does not exist in %s.", file, tzDatabaseDir))); enforce(file.isFile, new DateTimeException(format("%s is not a file.", file))); auto tzFile = File(file); diff --git a/std/path.d b/std/path.d index 254d8f0..b0fc04d 100644 --- a/std/path.d +++ b/std/path.d @@ -3080,8 +3080,11 @@ unittest } else { + pragma(msg, "test disabled on GNU Guix"); +/* assert(expandTilde("~root") == "/root", expandTilde("~root")); assert(expandTilde("~root/") == "/root/", expandTilde("~root/")); +*/ } assert(expandTilde("~Idontexist/hey") == "~Idontexist/hey"); } diff --git a/std/socket.d b/std/socket.d index b85d1c9..7fbf346 100644 --- a/std/socket.d +++ b/std/socket.d @@ -859,6 +862,8 @@ class InternetHost unittest { + pragma(msg, "test disabled on GNU Guix"); + /* InternetHost ih = new InternetHost; ih.getHostByAddr(0x7F_00_00_01); @@ -889,6 +894,7 @@ unittest // writefln("aliases[%d] = %s", i, s); // } }); + */ } th> 2019-03-16booloader: Add 'invoke/quiet'....* gnu/build/bootloader.scm (G_): New macro. (open-pipe-with-stderr, invoke/quiet): New procedures. * tests/build-utils.scm ("invoke/quiet, success") ("invoke/quiet, failure") ("invoke/quiet, failure, message on stderr"): New tests. * po/guix/POTFILES.in: Add bootloader.scm. Ludovic Courtès 2017-12-15bootloader: Factorize write-file-on-device....* gnu/bootloader/extlinux.scm (install-extlinux): Factorize bootloader writing in a new procedure write-file-on-device defined in (gnu build bootloader). * gnu/build/bootloader.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new file. * gnu/system/vm.scm (qemu-img): Adapt to import and use (gnu build bootloader) module during derivation building. * gnu/scripts/system.scm (bootloader-installer-derivation): Ditto. Mathieu Othacehe