mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-12 09:56:14 -05:00
2b24faa295
* gnu/packages/apr.scm: Rename file from libapr.scm.
* gnu/packages/patches/apr-skip-getservbyname-test.patch: Rename file
from libapr-skip-getservbyname-test.patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Rename module libapr to apr.
* gnu-system.am (dist_patch_DATA): Rename patch file.
* gnu/packages/apr.scm (apr): Rename from libapr.
* gnu/packages/apr.scm (apr-util): Rename from libaprutil, change
input name.
* gnu/packages/version-control.scm (subversion): Change input name.
25 lines
900 B
Diff
25 lines
900 B
Diff
--- test/testsock.c 2013-01-24 06:57:21.000000000 +0100
|
|
+++ test/testsock.c 2013-01-24 17:24:54.000000000 +0100
|
|
@@ -90,16 +90,22 @@
|
|
rv = apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, p);
|
|
APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
|
|
|
|
+ /* /etc/services is not available while compiling, so apr_getservbyname
|
|
+ * will always return APR_ENOENT. */
|
|
+#if 0
|
|
rv = apr_getservbyname(sa, "ftp");
|
|
APR_ASSERT_SUCCESS(tc, "Problem getting ftp service", rv);
|
|
ABTS_INT_EQUAL(tc, 21, sa->port);
|
|
+#endif
|
|
|
|
rv = apr_getservbyname(sa, "complete_and_utter_rubbish");
|
|
APR_ASSERT_SUCCESS(tc, "Problem getting non-existent service", !rv);
|
|
|
|
+#if 0
|
|
rv = apr_getservbyname(sa, "telnet");
|
|
APR_ASSERT_SUCCESS(tc, "Problem getting telnet service", rv);
|
|
ABTS_INT_EQUAL(tc, 23, sa->port);
|
|
+#endif
|
|
}
|
|
|
|
static apr_socket_t *setup_socket(abts_case *tc)
|