WIP: tests/emulator/test_channels_shell: investigate what happens to …

…$PATH
nix-community · Jul 10, 2024 · f95fb31 · f95fb31
1 parent 598fa1f
commit f95fb31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
@@ -13,6 +13,8 @@ writeText "login-inner" ''
 
   set -eo pipefail
 
+  echo login-inner PATH=$PATH
+
   ${lib.optionalString (config.environment.motd != null) ''
     if [ "$#" -eq 0 ]; then  # if script is called from within Nix-on-Droid app
       echo "${lib.removeSuffix "\n" config.environment.motd}"

diff --git a/modules/environment/login/login.nix b/modules/environment/login/login.nix
@@ -17,6 +17,8 @@ writeScript "login" ''
   # This file is generated by Nix-on-Droid. DO NOT EDIT.
   set -eu -o pipefail
 
+  echo login PATH=$PATH
+
   export USER="${config.user.userName}"
   export HOME="${config.user.home}"
   export PROOT_TMP_DIR=${installationDir}/tmp

diff --git a/tests/emulator/test_channels_shell.py b/tests/emulator/test_channels_shell.py
@@ -36,8 +36,8 @@ def run(d):
         ('cd /data/data/com.termux.nix/files/home; '
          'pwd; '
          'id; '
-         '/data/data/com.termux.nix/files/usr/bin/login '
-         ' nix-on-droid on-device-test')
+         'env PATH= /data/data/com.termux.nix/files/usr/bin/login '
+         ' nix-on-droid on-device-test'),
     ]:
         print(f'running {cmd} as {user} with capture:')
         p = subprocess.Popen(['adb', 'shell', 'su', '0', 'su', user,