Add working-directory directive.

.gitignore

@@ -3,3 +3,4 @@ __pycache__
 /nihtest.egg-info
 cmake-build-debug/
 /build
+.DS_Store

NEWS.md

@@ -1,6 +1,10 @@
+# 1.4.0 [Unreleased]
+
+- Add `working-directory` directive.
+
 # 1.3.0 [2023-12-22]
 
-- Add set-modification-time.
+- Add `set-modification-time` directive.
 - Fix inline stdin data.
 - Improve error handling.
 - Require python 3.9.

manpages/nihtest-case.mdoc

@@ -207,6 +207,11 @@ otherwise the expected text is taken from the following lines of the test case,
 .\" .Xr sh 1
 .\" command
 .\" .Dl ulimit -n 16 .
+.It Ic working-directory Ar directory
+Run the program in the subdirectory
+.Ar directory
+inside the sandbox.
+The directory will be created if it doesn't exist.
 .El
 .Sh SEE ALSO
 .Xr nihtest 1 ,

manpages/nihtest.conf.mdoc

@@ -85,6 +85,12 @@ See
 .Xr nihtest-case 5
 for details on
 .Ic stderr-replace .
+.It Ic default-working-directory = Ar directory
+Use
+.Ar directory
+as the working directory if no
+.Ic working-directory
+directive is found in the test.
 .It Ic environment-clear = true
 If
 .Ic environment-clear

nihtest/Configuration.py

@@ -14,6 +14,7 @@
     "settings": [
         "default-program",
         "default-stderr-replace",
+        "default-working-directory",
         "features-files",
         "keep-sandbox",
         "print-results",
@@ -116,6 +117,7 @@ def __init__(self, args):
             settings = config["settings"]
         self.default_program = get_value(settings, "default-program")
         self.default_stderr_replace = get_array(settings, "default-stderr-replace")
+        self.default_working_directory = get_value(settings, "default-working-directory")
         self.feature_files = get_array(settings, "features-files")
         self.keep_sandbox = get_when(settings, "keep-sandbox", When.NEVER)
         self.print_results = get_when(settings, "print-results", When.FAILED)

nihtest/Sandbox.py

@@ -8,6 +8,7 @@ def __init__(self, name, auto_cleanup):
         self.auto_cleanup = auto_cleanup
         self.entered = False
         self.directory = None
+        self.parent_directory = os.getcwd()
         basename = os.path.basename(name)
         self.directory = tempfile.mkdtemp(prefix=f"sandbox_{basename}.d", dir=".")
 
@@ -35,5 +36,10 @@ def enter(self):
     def leave(self):
         if not self.entered:
             raise RuntimeError("not in sandbox")
-        os.chdir("..")
+        os.chdir(self.parent_directory)
         self.entered = False
+
+    def chdir_top(self):
+        if not self.entered:
+            raise RuntimeError("not in sandbox")
+        os.chdir(os.path.join(self.parent_directory, self.directory))

nihtest/Test.py

@@ -78,7 +78,12 @@ def run(self):
         if self.case.preload:
             environment["LD_PRELOAD"] = " ".join(map(lambda file: self.case.configuration.find_program("lib" + file), self.case.preload))
         command = Command.Command(program, self.case.arguments, self.case.stdin, environment=environment)
+        if self.case.working_directory is not None:
+            if not os.path.exists(self.case.working_directory):
+                os.mkdir(self.case.working_directory)
+            os.chdir(self.case.working_directory)
         command.run()
+        self.sandbox.chdir_top()
         files_got = self.list_files()
         self.sandbox.leave()
 

nihtest/TestCase.py

@@ -56,6 +56,7 @@ def __init__(self, configuration, args):
         self.ok = True
         self.directories = []
         self.modification_times = {}
+        self.working_directory = configuration.default_working_directory
         self.parse_case()
         if not self.ok:
             raise RuntimeError("invalid test case")
@@ -199,6 +200,9 @@ def directive_stdin(self, arguments):
     def directive_stdout(self, arguments):
         self.stdout = self.io_data(arguments)
 
+    def directive_working_directory(self, arguments):
+        self.working_directory = arguments[0]
+
     directives = {
         "arguments": Directive(method=directive_arguments,
                                usage="[argument ...]",
@@ -260,6 +264,10 @@ def directive_stdout(self, arguments):
                             usage="[file]",
                             minimum_arguments=0, maximum_arguments=1,
                             only_once=True),
+        "working-directory": Directive(method=directive_working_directory,
+                                       usage="directory",
+                                       minimum_arguments=1,
+                                       only_once=True)
     }
 
     def get_program_directories(self):

tests/working-directory.input

@@ -0,0 +1,9 @@
+working-directory subdirectory
+program cat
+arguments ../working-directory-test-file
+file working-directory-test-file <>
+This file is in the top sandbox directory.
+end-of-inline-data
+stdout
+This file is in the top sandbox directory.
+end-of-inline-data

tests/working-directory.test

@@ -0,0 +1,5 @@
+program nihtest
+arguments case.test
+return 0
+file case.test working-directory.input
+file nihtest.conf nihtest-conf