01/01: build: Remove traces of 'NIX_SETUID_HELPER'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit aac783cac54e48bb5d85d911bcad198fe3c9de04
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 18 23:37:11 2016 +0100

    build: Remove traces of 'NIX_SETUID_HELPER'.
    
    This is a followup to 0919f5f4.
    
    * test-env.in: Remove occurrences of 'NIX_SETUID_HELPER'.
---
 test-env.in |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test-env.in b/test-env.in
index d6389a1..67f4f80 100644
--- a/test-env.in
+++ b/test-env.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 #
 # This file is part of GNU Guix.
 #
@@ -31,7 +31,6 @@ unset CDPATH
 
 if [ -x "@abs_top_builddir@/guix-daemon" ]
 then
-    NIX_SETUID_HELPER="@abs_top_builddir@/nix-setuid-helper" # normally unused
     NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
 
     # Do that because store.scm calls `canonicalize-path' on it.
@@ -87,10 +86,10 @@ then
     # For the (guix import snix) tests.
     NIXPKGS="@NIXPKGS@"
 
-    export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR                      \
-       NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR         \
-       NIX_ROOT_FINDER NIX_SETUID_HELPER GUIX_BINARY_SUBSTITUTE_URL    \
-        GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES                         \
+    export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR              \
+       NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \
+       NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL              \
+        GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES                 \
         NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS
 
     # Launch the daemon without chroot support because is may be