Add support for config.test.runner

1 files changed, 49 insertions, 2 deletions

diff --git a/tests/recipe/buildscript/testscript b/tests/recipe/buildscript/testscript
index 2603f62..6bdbd32 100644
--- a/tests/recipe/buildscript/testscript
+++ b/tests/recipe/buildscript/testscript
@@ -406,7 +406,7 @@
       }}
       % [diag=test] test
       {{
-        cat <$path($<) >?$path($>)
+        cat <$path($>) >?$path($<)
       }}
       EOI
 
@@ -431,7 +431,7 @@
       % [diag=test] test
       {{
         depdb clear
-        cat <$path($<) >?$path($>)
+        cat <$path($>) >?$path($<)
       }}
       EOI
 
@@ -439,6 +439,53 @@
       buildfile:7:3: error: 'depdb' builtin cannot be used to perform test
       EOE
   }
+
+  : runner
+  :
+  if ($cxx.target.class != 'windows')
+  {
+    echo 'bar' >=bar;
+
+    cat <<EOI >=run;
+      #!/bin/sh
+      if test "$1" = "--trace"; then
+        shift
+        echo "$*"
+      fi
+      "$@"
+      EOI
+
+    chmod u+x run;
+
+    cat <<EOI >=buildfile;
+      foo: bar
+      {{
+        cp $path($<) $path($>)
+      }}
+      % [diag=test] test
+      {{
+        if ($test.runner.path != [null])
+          $test.runner.path $test.runner.options cat <$path($>)
+        else
+          cat <$path($>)
+        end
+      }}
+      EOI
+
+    $* test 2>>EOE;
+      cp file{foo}
+      test file{foo}
+      bar
+      EOE
+
+    $* test config.test.runner="./run --trace" 2>>EOE;
+      test file{foo}
+      cat
+      bar
+      EOE
+
+    $* clean 2>-
+  }
 }
 
 : diff-label