diff options
Diffstat (limited to 'm4/guix.m4')
| -rw-r--r-- | m4/guix.m4 | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 1e5985b30b..acfc33e170 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,5 +1,5 @@ dnl GNU Guix --- Functional package management for GNU -dnl Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +dnl Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> dnl dnl This file is part of GNU Guix. @@ -175,9 +175,9 @@ AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [ [ac_cv_guix_test_root="`pwd`/test-tmp"]) ]) -dnl 'BINPRM_BUF_SIZE' constant in Linux. The Hurd has a limit -dnl of about a page (see exec/hashexec.c.) -m4_define([LINUX_HASH_BANG_LIMIT], 128) +dnl 'BINPRM_BUF_SIZE' constant in Linux (we leave room for the trailing zero.) +dnl The Hurd has a limit of about a page (see exec/hashexec.c.) +m4_define([LINUX_HASH_BANG_LIMIT], 127) dnl Hardcoded 'sun_path' length in <sys/un.h>. m4_define([SOCKET_FILE_NAME_LIMIT], 108) @@ -204,14 +204,24 @@ AC_DEFUN([GUIX_HASH_BANG_LENGTH], [ [ac_cv_guix_hash_bang_length=`echo -n "$storedir/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bootstrap-binaries-0/bin/bash" | wc -c`]) ]) +dnl GUIX_TEST_HASH_BANG_LENGTH +AC_DEFUN([GUIX_TEST_HASH_BANG_LENGTH], [ + AC_REQUIRE([GUIX_TEST_ROOT_DIRECTORY]) + AC_CACHE_CHECK([the length of a hash bang line used in tests], + [ac_cv_guix_test_hash_bang_length], + [ac_cv_guix_test_hash_bang_length=`echo -n "$ac_cv_guix_test_root/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bootstrap-binaries-0/bin/bash" | wc -c`]) +]) + dnl GUIX_CHECK_FILE_NAME_LIMITS dnl dnl GNU/Linux has a couple of silly limits that we can easily run into. -dnl Make sure everything is fine with the current settings. +dnl Make sure everything is fine with the current settings. Set $1 to +dnl 'yes' if tests can run, 'no' otherwise. AC_DEFUN([GUIX_CHECK_FILE_NAME_LIMITS], [ AC_REQUIRE([GUIX_SOCKET_FILE_NAME_LENGTH]) AC_REQUIRE([GUIX_TEST_SOCKET_FILE_NAME_LENGTH]) AC_REQUIRE([GUIX_HASH_BANG_LENGTH]) + AC_REQUIRE([GUIX_TEST_HASH_BANG_LENGTH]) if test "$ac_cv_guix_socket_file_name_length" -ge ]SOCKET_FILE_NAME_LIMIT[; then AC_MSG_ERROR([socket file name would exceed the maxium allowed length]) @@ -219,9 +229,16 @@ AC_DEFUN([GUIX_CHECK_FILE_NAME_LIMITS], [ if test "$ac_cv_guix_test_socket_file_name_length" -ge ]SOCKET_FILE_NAME_LIMIT[; then AC_MSG_WARN([socket file name limit may be exceeded when running tests]) fi + + $1=yes if test "$ac_cv_guix_hash_bang_length" -ge ]LINUX_HASH_BANG_LIMIT[; then + $1=no AC_MSG_ERROR([store directory '$storedir' would lead to overly long hash-bang lines]) fi + if test "$ac_cv_guix_test_hash_bang_length" -ge ]LINUX_HASH_BANG_LIMIT[; then + $1=no + AC_MSG_WARN([test directory '$ac_cv_guix_test_root' may lead to overly long hash-bang lines]) + fi ]) dnl GUIX_CHECK_CXX11 |