aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2015-12-26 17:15:13 +0300
committerPjotr Prins2015-12-26 17:15:13 +0300
commit2d293f25d7b5bd906d6937020d1f294da1c8c65f (patch)
tree8452beef1f3c199d59fe666034d18eb34d9985a8
parent8e903088a7442a047911bee5e4090dce624876fb (diff)
downloadguix-bioinformatics-2d293f25d7b5bd906d6937020d1f294da1c8c65f.tar.gz
Fixed patch
-rw-r--r--ldc-disable-tests.patch43
1 files changed, 21 insertions, 22 deletions
diff --git a/ldc-disable-tests.patch b/ldc-disable-tests.patch
index 7d85f7a..871089e 100644
--- a/ldc-disable-tests.patch
+++ b/ldc-disable-tests.patch
@@ -1,55 +1,54 @@
-Disable a few ldc tests.
-
-Patch by Pjotr Prins <pjotr.guix@thebird.nl>.
-
+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,8 @@ unittest
+@@ -3080,8 +3080,11 @@ unittest
}
else
{
-- assert(expandTilde("~root") == "/root", expandTilde("~root"));
-- assert(expandTilde("~root/") == "/root/", expandTilde("~root/"));
-+ // assert(expandTilde("~root") == "/root", expandTilde("~root"));
-+ // assert(expandTilde("~root/") == "/root/", expandTilde("~root/"));
++ 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..8d456c8 100644
+index b85d1c9..7fbf346 100644
--- a/std/socket.d
+++ b/std/socket.d
-@@ -519,6 +519,8 @@ unittest
+@@ -517,6 +517,8 @@ class Protocol
+
+ unittest
{
++ pragma(msg, "test disabled on GNU Guix");
++/*
// getprotobyname,number are unimplemented on Android
softUnittest({
-+ pragma(msg, "test disabled on GNU Guix");
-+ /*
Protocol proto = new Protocol;
- assert(proto.getProtocolByType(ProtocolType.TCP));
- //writeln("About protocol TCP:");
-@@ -529,6 +531,7 @@ unittest
- // }
+@@ -530,6 +532,7 @@ unittest
assert(proto.name == "tcp");
assert(proto.aliases.length == 1 && proto.aliases[0] == "TCP");
-+ */
});
++*/
}
+
@@ -859,6 +862,8 @@ class InternetHost
unittest
{
+ pragma(msg, "test disabled on GNU Guix");
-+/*
++ /*
InternetHost ih = new InternetHost;
ih.getHostByAddr(0x7F_00_00_01);
-@@ -888,6 +893,7 @@ unittest
- // {
+@@ -889,6 +894,7 @@ unittest
// writefln("aliases[%d] = %s", i, s);
// }
-+*/
});
++ */
}
+