From a3a6909bc8e33cf1bf102a315f398a252607b5e0 Mon Sep 17 00:00:00 2001
From: lbodor <lazar.bodor@ga.gov.au>
Date: Tue, 14 Mar 2023 01:48:12 +1100
Subject: [PATCH] Use $TEST_ROOT

---
 tests/nix-shell.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh
index 8cb4fd385..044b96d54 100644
--- a/tests/nix-shell.sh
+++ b/tests/nix-shell.sh
@@ -95,17 +95,11 @@ nix develop -f "$shellDotNix" shellDrv -c echo foo |& grepQuiet foo
 
 # Test 'nix print-dev-env'.
 
-scratch=$(mktemp -d -t tmp.XXXXXXXXXX)
-function finish {
-    rm -rf "$scratch"
-}
-trap finish EXIT
-
-nix print-dev-env -f "$shellDotNix" shellDrv > "$scratch/dev-env.sh"
-nix print-dev-env -f "$shellDotNix" shellDrv --json > "$scratch/dev-env.json"
+nix print-dev-env -f "$shellDotNix" shellDrv > $TEST_ROOT/dev-env.sh
+nix print-dev-env -f "$shellDotNix" shellDrv --json > $TEST_ROOT/dev-env.json
 
 # Ensure `nix print-dev-env --json` contains variable assignments.
-[[ $(jq -r .variables.arr1.value[2] "$scratch/dev-env.json") = '3 4' ]]
+[[ $(jq -r .variables.arr1.value[2] $TEST_ROOT/dev-env.json) = '3 4' ]]
 
 # Run tests involving `source <(nix print-dev-inv)` in subshells to avoid modifying the current
 # environment.
@@ -115,21 +109,21 @@ set +u # FIXME: Make print-dev-env `set -u` compliant (issue #7951)
 # Ensure `source <(nix print-dev-env)` modifies the environment.
 (
     path=$PATH
-    source "$scratch/dev-env.sh"
+    source $TEST_ROOT/dev-env.sh
     [[ -n $stdenv ]]
     [[ ${arr1[2]} = "3 4" ]]
     [[ ${arr2[1]} = $'\n' ]]
     [[ ${arr2[2]} = $'x\ny' ]]
     [[ $(fun) = blabla ]]
-    [[ $PATH = $(jq -r .variables.PATH.value "$scratch/dev-env.json"):$path ]]
+    [[ $PATH = $(jq -r .variables.PATH.value $TEST_ROOT/dev-env.json):$path ]]
 )
 
 # Ensure `source <(nix print-dev-env)` handles the case when PATH is empty.
 (
     path=$PATH
     PATH=
-    source "$scratch/dev-env.sh"
-    [[ $PATH = $(PATH=$path jq -r .variables.PATH.value "$scratch/dev-env.json") ]]
+    source $TEST_ROOT/dev-env.sh
+    [[ $PATH = $(PATH=$path jq -r .variables.PATH.value $TEST_ROOT/dev-env.json) ]]
 )
 
 # Test nix-shell with ellipsis and no `inNixShell` argument (for backwards compat with old nixpkgs)