Skip directories when looking up programs in the PATH

CHANGES.md

@@ -4,6 +4,9 @@ unreleased
 - unstable-fmt: use boxes to wrap some lists (#1608, fix #1153, @emillon,
   thanks to @rgrinberg)
 
+- skip directories when looking up programs in the PATH (#1628, fixes
+  #1616, @diml)
+
 1.6.2 (05/12/2018)
 ------------------
 

src/stdune/bin.ml

@@ -18,13 +18,19 @@ let cons_path p ~_PATH =
 
 let exe = if Sys.win32 then ".exe" else ""
 
+let exists fn =
+  match Unix.stat (Path.to_string fn) with
+  | { st_kind = S_DIR; _ } -> false
+  | exception (Unix.Unix_error _) -> false
+  | _ -> true
+
 let best_prog dir prog =
   let fn = Path.relative dir (prog ^ ".opt" ^ exe) in
-  if Path.exists fn then
+  if exists fn then
     Some fn
   else
     let fn = Path.relative dir (prog ^ exe) in
-    if Path.exists fn then
+    if exists fn then
       Some fn
     else
       None

test/blackbox-tests/dune.inc

@@ -455,6 +455,14 @@
    test-cases/github1560
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name github1616)
+ (deps (package dune) (source_tree test-cases/github1616))
+ (action
+  (chdir
+   test-cases/github1616
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name github20)
  (deps (package dune) (source_tree test-cases/github20))
@@ -1225,6 +1233,7 @@
   (alias github1529)
   (alias github1549)
   (alias github1560)
+  (alias github1616)
   (alias github20)
   (alias github24)
   (alias github25)
@@ -1368,6 +1377,7 @@
   (alias github1529)
   (alias github1549)
   (alias github1560)
+  (alias github1616)
   (alias github20)
   (alias github24)
   (alias github25)

test/blackbox-tests/test-cases/github1616/bin1/prog

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec echo 'Hello, World!'

test/blackbox-tests/test-cases/github1616/root/dune

@@ -0,0 +1,3 @@
+(alias
+ (name default)
+ (action (run prog)))

test/blackbox-tests/test-cases/github1616/root/dune-project

@@ -0,0 +1 @@
+(lang dune 1.6)

test/blackbox-tests/test-cases/github1616/run.t

@@ -0,0 +1,6 @@
+Regression test for #1616
+
+  $ env PATH="$PWD/bin2:$PWD/bin1:$PATH" dune build --root root
+  Entering directory 'root'
+          prog alias default
+  Hello, World!