From e0c6ed1c8370d1dbfd60a294666c50929fe1c8fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 18 Nov 2024 16:07:35 +0100
Subject: [PATCH] Fix help test in dev shell

Not sure what the intent was expecting help.sh to fail in the main suite, but it caused `meson test` to fail inside a `nix develop` shell:

  $ meson test help --print-errorlogs
  ninja: Entering directory `/home/eelco/Dev/nix-master/build'
  1/1 nix-functional-tests:main / help        UNEXPECTEDPASS   4.02s
---
 tests/functional/help.sh     | 2 ++
 tests/functional/meson.build | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/help.sh b/tests/functional/help.sh
index 127cc455b..e195e10eb 100755
--- a/tests/functional/help.sh
+++ b/tests/functional/help.sh
@@ -2,6 +2,8 @@
 
 source common.sh
 
+[[ $(type -p man) ]] || skipTest "'man' not installed"
+
 # test help output
 
 nix-build --help
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 83e08c4f5..dee003e42 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -242,8 +242,6 @@ foreach suite : suites
       # Used for target dependency/ordering tracking, not adding compiler flags or anything.
       depends : suite['deps'],
       workdir : workdir,
-      # Won't pass until man pages are generated
-      should_fail : suite['name'] == 'main' and script == 'help.sh'
     )
   endforeach
 endforeach