aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2015-12-27 10:53:07 +0300
committerPjotr Prins2015-12-27 10:53:07 +0300
commit57f3a825f579de4deb9c2cb35410418ee358f487 (patch)
tree7b731cdc1df8f50431c83b701240956a9b872bb9
parent2c00e4a0a21d938137e8e7648b29c0b0f753d06d (diff)
downloadguix-bioinformatics-57f3a825f579de4deb9c2cb35410418ee358f487.tar.gz
ldc: trying to fix test
-rw-r--r--gn/packages/dlanguage.scm8
-rw-r--r--ldc-disable-tests.patch11
2 files changed, 15 insertions, 4 deletions
diff --git a/gn/packages/dlanguage.scm b/gn/packages/dlanguage.scm
index dfcf8b0..dccee0c 100644
--- a/gn/packages/dlanguage.scm
+++ b/gn/packages/dlanguage.scm
@@ -44,10 +44,12 @@
(supported-systems '("x86_64-linux" "i686-linux"))
(arguments `(
;; When #:tests? set to #t only the following tests FAILED:
- ;; 223 - std.path (Failed) ;; phobos/std/path.d(3083): ~root
;; 243 - std.datetime (Failed) ;; Directory /usr/share/zoneinfo/ does not exist.
- ;; 253 - std.socket (Failed) ;; No service for epmap
- ;; See ./build/Testing/Temporary/LastTest.log
+ ;; See ./build/Testing/Temporary/LastTest.log for executing (individual) tests
+ ;; Note: Run cmake as an out of build directory
+ ;; in build: cmake ../ldc-0.16.1
+ ;; and in runtime: cmake --build /tmp/nix-build-ldc-0.16.1.drv-4/build --target phobos2-ldc-unittest-debug -- -j 8
+ ;; run phobos2-test-runner-debug std.datetime
#:tests? #t
#:phases
(modify-phases %standard-phases
diff --git a/ldc-disable-tests.patch b/ldc-disable-tests.patch
index 1e13ea6..67f55e3 100644
--- a/ldc-disable-tests.patch
+++ b/ldc-disable-tests.patch
@@ -1,5 +1,5 @@
diff --git a/std/datetime.d b/std/datetime.d
-index 8e4ed3b..1be9099 100644
+index 8e4ed3b..4a733e6 100644
--- a/std/datetime.d
+++ b/std/datetime.d
@@ -28018,6 +28018,7 @@ public:
@@ -10,6 +10,15 @@ index 8e4ed3b..1be9099 100644
enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
}
else version(Windows)
+@@ -28076,7 +28077,7 @@ assert(tz.dstName == "PDT");
+
+ immutable file = buildNormalizedPath(tzDatabaseDir, name);
+
+- 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