From d8d1dd1b83f15fdf4c7f0a0cc594fa870037d17d Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Fri, 29 Mar 2024 20:29:44 -0400
Subject: [PATCH] gc: Don't skip lsof during tests

---
 src/libstore/gc.cc                            | 25 ++++++++-----------
 .../common/vars-and-functions.sh.in           |  1 -
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 20519c1a2..83232028d 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -420,22 +420,17 @@ void LocalStore::findRuntimeRoots(Roots & roots, bool censor)
     }
 
 #if !defined(__linux__)
-    // lsof is really slow on OS X. This actually causes the gc-concurrent.sh test to fail.
-    // See: https://github.com/NixOS/nix/issues/3011
-    // Because of this we disable lsof when running the tests.
-    if (getEnv("_NIX_TEST_NO_LSOF") != "1") {
-        try {
-            std::regex lsofRegex(R"(^n(/.*)$)");
-            auto lsofLines =
-                tokenizeString<std::vector<std::string>>(runProgram(LSOF, true, { "-n", "-w", "-F", "n" }), "\n");
-            for (const auto & line : lsofLines) {
-                std::smatch match;
-                if (std::regex_match(line, match, lsofRegex))
-                    unchecked[match[1]].emplace("{lsof}");
-            }
-        } catch (ExecError & e) {
-            /* lsof not installed, lsof failed */
+    try {
+        std::regex lsofRegex(R"(^n(/.*)$)");
+        auto lsofLines =
+            tokenizeString<std::vector<std::string>>(runProgram(LSOF, true, { "-n", "-w", "-F", "n" }), "\n");
+        for (const auto & line : lsofLines) {
+            std::smatch match;
+            if (std::regex_match(line, match, lsofRegex))
+                unchecked[match[1]].emplace("{lsof}");
         }
+    } catch (ExecError & e) {
+        /* lsof not installed, lsof failed */
     }
 #endif
 
diff --git a/tests/functional/common/vars-and-functions.sh.in b/tests/functional/common/vars-and-functions.sh.in
index b054bf834..3d2e44024 100644
--- a/tests/functional/common/vars-and-functions.sh.in
+++ b/tests/functional/common/vars-and-functions.sh.in
@@ -24,7 +24,6 @@ if [[ -n $NIX_STORE ]]; then
     export _NIX_TEST_NO_SANDBOX=1
 fi
 export _NIX_IN_TEST=$TEST_ROOT/shared
-export _NIX_TEST_NO_LSOF=1
 export NIX_REMOTE=${NIX_REMOTE_-}
 unset NIX_PATH
 export TEST_HOME=$TEST_ROOT/test-home