diff options
| -rw-r--r-- | tests/002/query-1.txr | 2 | ||||
| -rw-r--r-- | tests/010/json.tl | 2 | ||||
| -rw-r--r-- | tests/017/realpath.tl | 3 | ||||
| -rw-r--r-- | tests/018/path-test.tl | 5 | ||||
| -rw-r--r-- | tests/018/process.tl | 3 |
5 files changed, 11 insertions, 4 deletions
diff --git a/tests/002/query-1.txr b/tests/002/query-1.txr index a98b82eb..4bd6c97f 100644 --- a/tests/002/query-1.txr +++ b/tests/002/query-1.txr @@ -1,4 +1,4 @@ -@(do (unless (and (path-search "ls") (path-search "sort")) +@(do (unless (path-executable-to-me-p "/bin/sh") (exit 13))) @(next `!ls @TESTDIR/proc | sort -n`) @(collect) diff --git a/tests/010/json.tl b/tests/010/json.tl index a0085000..a7a73623 100644 --- a/tests/010/json.tl +++ b/tests/010/json.tl @@ -149,7 +149,7 @@ (file-put-jsons name '(1.0 t null)) t (file-get-jsons name) (1.0 t null) (file-get-string name) "1\ntrue\nnull\n") - (if (path-search "cat") + (if (path-executable-to-me-p "/bin/sh") (mtest (command-put-json `cat > @name` #(#() #())) t (file-get-string name) "[[],[]]\n" diff --git a/tests/017/realpath.tl b/tests/017/realpath.tl index 5471a1c8..68ee7a7f 100644 --- a/tests/017/realpath.tl +++ b/tests/017/realpath.tl @@ -1,6 +1,7 @@ (load "../common") -(when (memq (os-symbol) '(:cygwin :solaris :android)) +(when (or (memq (os-symbol) '(:cygwin :solaris :android)) + (not (path-exists-p "/usr/bin"))) (put-string (file-get-string "tests/017/realpath.expected")) (exit 0)) diff --git a/tests/018/path-test.tl b/tests/018/path-test.tl index 75a8d2d3..919186ac 100644 --- a/tests/018/path-test.tl +++ b/tests/018/path-test.tl @@ -1,7 +1,10 @@ (load "../common") +(unless (path-executable-to-me-p "/bin/sh") + (exit 0)) + (mtest - (ends-with "/sh" (path-search "sh")) t + (ends-with "/bin/sh" (path-search "sh")) t (path-search "AlMoStCeRtAiNlLyNoNeXisTenT") nil (path-search "") nil (path-search "sh" nil) nil diff --git a/tests/018/process.tl b/tests/018/process.tl index 1b3780ac..07ecfb64 100644 --- a/tests/018/process.tl +++ b/tests/018/process.tl @@ -1,5 +1,8 @@ (load "../common") +(unless (path-executable-to-me-p "/bin/sh") + (exit 0)) + (defun cmd (c : (m "r")) (with-stream (s (open-command c m)) (get-string s))) |