Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c; instead the harness should set it. In Guix we set it explicitly; the right thing is to use AM_TEST_ENVIRONMENT and regenerate the makefiles, but we can't regenerate because current autotools carp on some things, so we patch the Makefile.in instead. Also fix to not try to create /var/lib/upower if /var isn't writable. Patch by Andy Wingo Reduced to upower 0.99.10 by Tobias Geerinckx-Rice --- upower-0.99.2.orig/src/Makefile.in 2014-12-18 10:32:01.000000000 +0100 +++ upower-0.99.2/src/Makefile.in 2015-04-04 19:49:28.020843678 +0200 @@ -1789,7 +1790,7 @@ @HAVE_SYSTEMDSYSTEMUNITDIR_TRUE@ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ install-data-hook: - if test -w $(DESTDIR)$(prefix)/; then \ + if test -w $(DESTDIR)$(localstatedir)/; then \ mkdir -p $(DESTDIR)$(historydir); \ fi > Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-04-04tests: Adjust search-paths test following the introduction of aarch64....Fixes a regression introduced in 3b88f3767d9f3ad2cc64173525cd53d429bfe7e7. * tests/search-paths.scm ("evaluate-search-paths, separator is #f"): Change the expected result to "aarch64-linux". Ludovic Courtès
2017-01-23search-paths: Allow specs with #f as their separator....This adds support for single-entry search paths. Fixes <http://bugs.gnu.org/25422>. Reported by Leo Famulari <leo@famulari.name>. * guix/search-paths.scm (<search-path-specification>)[separator]: Document as string or #f. (evaluate-search-paths): Add case for SEPARATOR as #f. (environment-variable-definition): Handle SEPARATOR being #f. * guix/build/utils.scm (list->search-path-as-string): Add case for SEPARATOR as #f. (search-path-as-string->list): Likewise. * guix/build/profiles.scm (abstract-profile): Likewise. * tests/search-paths.scm: New file. * Makefile.am (SCM_TESTS): Add it. * tests/packages.scm ("--search-paths with single-item search path"): New test. * gnu/packages/version-control.scm (git)[native-search-paths](separator): New field. Ludovic Courtès