From de90280aa0895d5b302a3137a3fa1a171a9f127c Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Mon, 18 Jun 2018 14:26:23 +0200
Subject: Fix #7704: get_toplevel_path needs normalised argv.(0)

When launched through PATH argv.(0) is just the command name.

eg "coqtop -compile foo.v" -> argv.(0) = "coqtop"

Using executable_name also follows symlinks but this isn't tested to
avoid messing with windows. Running Coq through a symlink is not as
important as PATH anyways.
---
 lib/system.ml             | 2 +-
 test-suite/Makefile       | 1 +
 test-suite/misc/7704.sh   | 7 +++++++
 test-suite/misc/aux7704.v | 6 ++++++
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 test-suite/misc/7704.sh
 create mode 100644 test-suite/misc/aux7704.v

diff --git a/lib/system.ml b/lib/system.ml
index f109c71925..eef65a4e3d 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -302,7 +302,7 @@ let with_time ~batch f x =
     raise e
 
 let get_toplevel_path top =
-  let dir = Filename.dirname Sys.argv.(0) in
+  let dir = Filename.dirname Sys.executable_name in
   let exe = if Sys.(os_type = "Win32" || os_type = "Cygwin") then ".exe" else "" in
   let eff = if Dynlink.is_native then ".opt" else ".byte" in
   dir ^ Filename.dir_sep ^ top ^ eff ^ exe
diff --git a/test-suite/Makefile b/test-suite/Makefile
index 32e245e362..33b4023272 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -519,6 +519,7 @@ $(patsubst %.sh,%.log,$(wildcard misc/*.sh)): %.log: %.sh $(PREREQUISITELOG)
 	@echo "TEST      $<"
 	$(HIDE){ \
 	  echo $(call log_intro,$<); \
+	  export BIN="$(BIN)"; \
 	  export coqc="$(coqc)"; \
 	  export coqtop="$(coqtop)"; \
 	  export coqdep="$(coqdep)"; \
diff --git a/test-suite/misc/7704.sh b/test-suite/misc/7704.sh
new file mode 100755
index 0000000000..0ca2c97d24
--- /dev/null
+++ b/test-suite/misc/7704.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+export PATH=$BIN:$PATH
+
+${coqtop#"$BIN"} -compile misc/aux7704.v
diff --git a/test-suite/misc/aux7704.v b/test-suite/misc/aux7704.v
new file mode 100644
index 0000000000..6fdcf67684
--- /dev/null
+++ b/test-suite/misc/aux7704.v
@@ -0,0 +1,6 @@
+
+Goal True /\ True.
+Proof.
+  split.
+  par:exact I.
+Qed.
-- 
cgit v1.2.3